diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 16:34:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-01 16:34:49 +0000 |
| commit | 7d791652c7ede4209a2014d885148e2713f49bce (patch) | |
| tree | c26baf12593bed381c631b81c736106809d46b44 /chrome/browser/sync | |
| parent | 3b94427c99bdf12836fd455eeb1499fdde511e26 (diff) | |
| download | chromium_src-7d791652c7ede4209a2014d885148e2713f49bce.zip chromium_src-7d791652c7ede4209a2014d885148e2713f49bce.tar.gz chromium_src-7d791652c7ede4209a2014d885148e2713f49bce.tar.bz2 | |
Move browser/cocoa to browser/ui/cocoa
BUG=none
TEST=none
TBR=brettw
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util_mac_unittest.mm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index f9f9250..fc7586c 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -12,9 +12,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#if defined(OS_MACOSX) -#include "chrome/browser/cocoa/html_dialog_window_controller_cppsafe.h" -#endif #include "chrome/browser/dom_ui/dom_ui_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" @@ -24,6 +21,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#if defined(OS_MACOSX) +#include "chrome/browser/ui/cocoa/html_dialog_window_controller_cppsafe.h" +#endif #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/pref_names.h" #include "gfx/font.h" diff --git a/chrome/browser/sync/sync_ui_util_mac_unittest.mm b/chrome/browser/sync/sync_ui_util_mac_unittest.mm index 96f72e7..ef5e32f 100644 --- a/chrome/browser/sync/sync_ui_util_mac_unittest.mm +++ b/chrome/browser/sync/sync_ui_util_mac_unittest.mm @@ -9,7 +9,7 @@ #include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/cocoa/cocoa_test_helper.h" +#include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" |