Commit 27d1690d authored by scottmg@chromium.org's avatar scottmg@chromium.org

Exclude some CrOS code that causes link errors on Windows incr. link

On Windows, when linking non-incrementally the functions that call the
CrOS-only code are dead-stripped so there's no error, but with incremental
linking the link fails.

BUG=92171
TEST=Links on all platforms


Review URL: http://codereview.chromium.org/7497040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96141 0039d316-1c4b-4281-b951-d872f2087c98
parent ee6d2304
...@@ -209,6 +209,7 @@ ExtensionInputImeEventRouter::~ExtensionInputImeEventRouter() { ...@@ -209,6 +209,7 @@ ExtensionInputImeEventRouter::~ExtensionInputImeEventRouter() {
void ExtensionInputImeEventRouter::Init() { void ExtensionInputImeEventRouter::Init() {
} }
#if defined(OS_CHROMEOS)
bool ExtensionInputImeEventRouter::RegisterIme( bool ExtensionInputImeEventRouter::RegisterIme(
Profile* profile, Profile* profile,
const std::string& extension_id, const std::string& extension_id,
...@@ -259,6 +260,7 @@ bool ExtensionInputImeEventRouter::RegisterIme( ...@@ -259,6 +260,7 @@ bool ExtensionInputImeEventRouter::RegisterIme(
return true; return true;
} }
#endif
chromeos::InputMethodEngine* ExtensionInputImeEventRouter::GetEngine( chromeos::InputMethodEngine* ExtensionInputImeEventRouter::GetEngine(
const std::string& extension_id, const std::string& engine_id) { const std::string& extension_id, const std::string& engine_id) {
...@@ -503,6 +505,7 @@ bool SetCandidateWindowPropertiesFunction::RunImpl() { ...@@ -503,6 +505,7 @@ bool SetCandidateWindowPropertiesFunction::RunImpl() {
return true; return true;
} }
#if defined(OS_CHROMEOS)
bool SetCandidatesFunction::ReadCandidates( bool SetCandidatesFunction::ReadCandidates(
ListValue* candidates, ListValue* candidates,
std::vector<chromeos::InputMethodEngine::Candidate>* output) { std::vector<chromeos::InputMethodEngine::Candidate>* output) {
...@@ -628,3 +631,4 @@ bool UpdateMenuItemsFunction::RunImpl() { ...@@ -628,3 +631,4 @@ bool UpdateMenuItemsFunction::RunImpl() {
// TODO // TODO
return true; return true;
} }
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment