diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 22:39:27 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 22:39:27 +0000 |
| commit | 2bb5130ad15a91a9e05641ca62c2a49e5c692445 (patch) | |
| tree | 92ec055e791ea39d889b8aa26f386a41839ba155 /chrome/browser/sync | |
| parent | d8e107a5007a03a8ed5e39de98d3fe1eef2d27d9 (diff) | |
| download | chromium_src-2bb5130ad15a91a9e05641ca62c2a49e5c692445.zip chromium_src-2bb5130ad15a91a9e05641ca62c2a49e5c692445.tar.gz chromium_src-2bb5130ad15a91a9e05641ca62c2a49e5c692445.tar.bz2 | |
Revert 75453 - WebUI: Move more files from chrome/browser/dom_ui to chrome/browser/webui. Part 5.
BUG=59945, 59946
TEST=trybots
Review URL: http://codereview.chromium.org/6538053
TBR=tfarina@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_setup_wizard.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index 39b9291..99e9ede 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/sync/profile_sync_service_mock.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/common/url_constants.h" ProfileSyncServiceMock::ProfileSyncServiceMock() {} diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h index b346e6e..dc22804 100644 --- a/chrome/browser/sync/sync_setup_flow.h +++ b/chrome/browser/sync/sync_setup_flow.h @@ -11,10 +11,10 @@ #include "base/gtest_prod_util.h" #include "base/time.h" +#include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_setup_wizard.h" #include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/webui/html_dialog_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc index 0dd2658..deb56a2 100644 --- a/chrome/browser/sync/sync_setup_wizard.cc +++ b/chrome/browser/sync/sync_setup_wizard.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -7,12 +7,12 @@ #include "base/message_loop.h" #include "base/singleton.h" #include "chrome/browser/browser_thread.h" +#include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_setup_flow.h" -#include "chrome/browser/webui/chrome_url_data_manager.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" |