diff options
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_ui_util_mac_unittest.mm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index d031292..f1e99bf 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -7,7 +7,6 @@ #include <map> #include <set> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" @@ -45,6 +44,7 @@ #include "grit/generated_resources.h" #include "jingle/notifier/communicator/const_communicator.h" #include "net/base/cookie_monster.h" +#include "ui/base/l10n/l10n_util.h" using browser_sync::ChangeProcessor; using browser_sync::DataTypeController; diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h index b47c103..8861fd7 100644 --- a/chrome/browser/sync/sync_setup_flow.h +++ b/chrome/browser/sync/sync_setup_flow.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/gtest_prod_util.h" #include "base/time.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" @@ -18,6 +17,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "gfx/native_widget_types.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" class FlowHandler; class SyncSetupFlowContainer; diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index fd71497..e1ac70f 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -4,7 +4,6 @@ #include "chrome/browser/sync/sync_ui_util.h" -#include "app/l10n_util.h" #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" @@ -16,6 +15,7 @@ #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" typedef GoogleServiceAuthError AuthError; diff --git a/chrome/browser/sync/sync_ui_util_mac.mm b/chrome/browser/sync/sync_ui_util_mac.mm index 3cd17d5..51a6bb7 100644 --- a/chrome/browser/sync/sync_ui_util_mac.mm +++ b/chrome/browser/sync/sync_ui_util_mac.mm @@ -6,11 +6,11 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace sync_ui_util { diff --git a/chrome/browser/sync/sync_ui_util_mac_unittest.mm b/chrome/browser/sync/sync_ui_util_mac_unittest.mm index ef5e32f..bebb06e 100644 --- a/chrome/browser/sync/sync_ui_util_mac_unittest.mm +++ b/chrome/browser/sync/sync_ui_util_mac_unittest.mm @@ -6,12 +6,12 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { |
