diff options
author | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 17:08:36 +0000 |
---|---|---|
committer | maniscalco@chromium.org <maniscalco@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 17:08:36 +0000 |
commit | 0229235e3f8734f9cae48748529f68ccbf1d289c (patch) | |
tree | d892127fcd0b23243237cb26bde3f37454921ccc /chrome/browser/extensions/extension_service.h | |
parent | e9da2b7913d6af558ecfe79e769c3db966f548e8 (diff) | |
download | chromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.zip chromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.tar.gz chromium_src-0229235e3f8734f9cae48748529f68ccbf1d289c.tar.bz2 |
Include sync.pb.h in sync_data.h.
This change has two parts, including sync.pb.h in sync_data.h, and fixing
gyp dependencies and header includes so that everything still builds.
Include sync.pb.h in sync_data.h in preparation for using AttachmentId
(a protobuf in sync.pb.h) in sync_data.h. A forward declaration is
insufficient because sync_data.h will be getting a typedef for vector<>
of AttachmentId.
Several targets (transitively) depend on sync, however, their dependence
is not properly modeled in gyp. Update dependencies and header includes
so they can "see" sync.pb.h (a generated header) and any headers it
includes.
Without these changes, four targets fail to build:
1. extensions_browser - See extensions/extensions.gyp for the fix. Here's
the compiler error:
In file included from ../../extensions/browser/extension_function.cc:10:
In file included from ../../chrome/browser/extensions/extension_service.h:23:
In file included from ../../chrome/browser/extensions/extension_sync_service.h:12:
In file included from ../../chrome/browser/extensions/app_sync_bundle.h:15:
In file included from ../../chrome/browser/extensions/app_sync_data.h:8:
In file included from ../../chrome/browser/extensions/extension_sync_data.h:11:
In file included from ../../sync/api/sync_change.h:13:
../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
2. debugger - See chrome/chrome.gyp for the fix. Here's the compiler
error:
In file included from ../../chrome/browser/devtools/browser_list_tabcontents_provider.cc:10:
In file included from ../../chrome/browser/history/top_sites.h:13:
In file included from ../../chrome/browser/history/history_service.h:26:
In file included from ../../chrome/browser/history/delete_directive_handler.h:12:
In file included from ../../sync/api/sync_change_processor.h:10:
../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
3. apps - See chrome/chrome_browser_extensions.gypi for the fix. Here's
the compiler error:
In file included from ../../apps/app_load_service.cc:12:
In file included from ../../chrome/browser/extensions/extension_service.h:23:
In file included from ../../chrome/browser/extensions/extension_sync_service.h:12:
In file included from ../../chrome/browser/extensions/app_sync_bundle.h:15:
In file included from ../../chrome/browser/extensions/app_sync_data.h:8:
In file included from ../../chrome/browser/extensions/extension_sync_data.h:11:
In file included from ../../sync/api/sync_change.h:13:
../../sync/api/sync_data.h:17:10: fatal error: 'sync/protocol/sync.pb.h' file not found
4. performance_ui_tests - See chrome/chrome_tests.gypi for the fix.
Here's the compiler error:
In file included from ../../chrome/test/perf/generate_profile.cc:19:
In file included from ../../chrome/browser/history/history_service.h:26:
In file included from ../../chrome/browser/history/delete_directive_handler.h:12:
In file included from ../../sync/api/sync_change_processor.h:10:
In file included from ../../sync/api/sync_data.h:17:
gen/protoc_out/sync/protocol/sync.pb.h:9:10: fatal error: 'google/protobuf/stubs/common.h' file not found
BUG=
Review URL: https://codereview.chromium.org/182313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.h')
-rw-r--r-- | chrome/browser/extensions/extension_service.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index 5956f48..b832e86 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -19,7 +19,6 @@ #include "base/prefs/pref_change_registrar.h" #include "base/strings/string16.h" #include "chrome/browser/extensions/blacklist.h" -#include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/devtools_agent_host.h" @@ -63,6 +62,7 @@ class UpdateObserver; using extensions::ExtensionIdSet; namespace syncer { +class ExtensionSyncService; class SyncErrorFactory; } |