diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-05 01:18:27 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-05 01:18:27 +0000 |
| commit | 132c8565a63ad57d680b6b8d9beaa28786a46ea8 (patch) | |
| tree | 428425605547842abd6a7ab851bd27132f11efde /chrome/browser/views/options/options_window_view.cc | |
| parent | f902600776feea6570c876f2349bb4a8746ea95b (diff) | |
| download | chromium_src-132c8565a63ad57d680b6b8d9beaa28786a46ea8.zip chromium_src-132c8565a63ad57d680b6b8d9beaa28786a46ea8.tar.gz chromium_src-132c8565a63ad57d680b6b8d9beaa28786a46ea8.tar.bz2 | |
Add files to browser/sync and tweak includes.
Create browser/sync/glue and /engine.
Create sync watchlist and add a few folks.
No GYP change here so no build changes should occur.
chrome.gyp CL is coming shortly, as well as live_sync tests.
Review URL: http://codereview.chromium.org/160598
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options/options_window_view.cc')
| -rw-r--r-- | chrome/browser/views/options/options_window_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index ad77aa9..7554a57 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -11,13 +11,13 @@ #include "chrome/browser/views/options/advanced_page_view.h" #include "chrome/browser/views/options/content_page_view.h" #include "chrome/browser/views/options/general_page_view.h" +#ifdef CHROME_PERSONALIZATION +#include "chrome/browser/sync/personalization.h" +#include "chrome/browser/views/options/user_data_page_view.h" +#endif #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#ifdef CHROME_PERSONALIZATION -#include "chrome/personalization/personalization.h" -#include "chrome/personalization/views/user_data_page_view.h" -#endif #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" |