diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:08:38 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:08:38 +0000 |
| commit | 11af41c9e407cc24b41ffa9de99d0f9e6846360e (patch) | |
| tree | d654e3a073e4f935e9f1ff3a07fc0fe1ec4b6319 /chrome/common/all_messages.h | |
| parent | b912496173a4a1a194f95e254e179725c66ccf0b (diff) | |
| download | chromium_src-11af41c9e407cc24b41ffa9de99d0f9e6846360e.zip chromium_src-11af41c9e407cc24b41ffa9de99d0f9e6846360e.tar.gz chromium_src-11af41c9e407cc24b41ffa9de99d0f9e6846360e.tar.bz2 | |
Disable uses of ProfileImportProcess on Android.
This is part of the unit_tests linking effort on Android.
This moves the profile import-related code excluded on Android to its own class.
BUG=136787
Review URL: https://chromiumcodereview.appspot.com/10777012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/all_messages.h')
| -rw-r--r-- | chrome/common/all_messages.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/all_messages.h b/chrome/common/all_messages.h index 1d51146..1df763a 100644 --- a/chrome/common/all_messages.h +++ b/chrome/common/all_messages.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,7 +8,9 @@ // ipc/ipc_message_utils.h to include the corresponding message file. // Messages classes used exclusively outside of chrome should instead get an // exemption in chrome/tools/ipclist/ipclist.cc. +#if !defined(OS_ANDROID) #include "chrome/browser/importer/profile_import_process_messages.h" +#endif // We can't make common_message_generator.h include automation_messages, since // otherwise the Chrome Frame binaries will link in a lot of unrelated chrome // code. Chrome Frame should not be depending on the chrome target... |