diff options
Diffstat (limited to 'chrome')
27 files changed, 32 insertions, 32 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 016b8ae..002a306 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -78,9 +78,9 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/toolkit_extra_parts.h" #include "chrome/browser/ui/chrome_select_file_policy.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/browser/user_style_sheet_watcher.h" #include "chrome/browser/user_style_sheet_watcher_factory.h" #include "chrome/browser/validation_message_message_filter.h" diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 4899856..41ec1e5 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -39,9 +39,9 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 8054dd6..e0e7011 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -77,6 +77,7 @@ #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/startup/autolaunch_prompt.h" #include "chrome/browser/ui/startup/default_browser_prompt.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/pinned_tab_codec.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "chrome/browser/ui/webui/flags_ui.h" @@ -84,7 +85,6 @@ #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/plugins_ui.h" #include "chrome/browser/ui/webui/print_preview/sticky_settings.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/web_resource/promo_resource_service.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 5a06c72..15c174c 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -34,7 +34,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths_internal.h" diff --git a/chrome/browser/signin/DEPS b/chrome/browser/signin/DEPS index 2ec418519..05965ba 100644 --- a/chrome/browser/signin/DEPS +++ b/chrome/browser/signin/DEPS @@ -47,8 +47,8 @@ specific_include_rules = { "!chrome/browser/sync/profile_sync_service_mock.h", "!chrome/browser/ui/browser.h", "!chrome/browser/ui/singleton_tabs.h", + "!chrome/browser/ui/sync/sync_promo_ui.h", "!chrome/browser/ui/tabs/tab_strip_model.h", - "!chrome/browser/ui/webui/sync_promo/sync_promo_ui.h", ], # These files are staying in //chrome so no need to limit. diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc index ca8e34f..6422eec 100644 --- a/chrome/browser/signin/signin_browsertest.cc +++ b/chrome/browser/signin/signin_browsertest.cc @@ -9,10 +9,10 @@ #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/singleton_tabs.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/ui/app_list/chrome_signin_delegate.cc b/chrome/browser/ui/app_list/chrome_signin_delegate.cc index a68db45..ed9639d 100644 --- a/chrome/browser/ui/app_list/chrome_signin_delegate.cc +++ b/chrome/browser/ui/app_list/chrome_signin_delegate.cc @@ -13,7 +13,7 @@ #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/common/page_transition_types.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/auto_login_infobar_delegate.cc index 871a783..2cb853a 100644 --- a/chrome/browser/ui/auto_login_infobar_delegate.cc +++ b/chrome/browser/ui/auto_login_infobar_delegate.cc @@ -16,7 +16,7 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/ubertoken_fetcher.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index c5d34be..b7bd0f8 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -23,9 +23,9 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/tabs/tab_strip_model_utils.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" diff --git a/chrome/browser/ui/browser_mac.h b/chrome/browser/ui/browser_mac.h index 2019b69..5031ac5 100644 --- a/chrome/browser/ui/browser_mac.h +++ b/chrome/browser/ui/browser_mac.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_BROWSER_MAC_H_ #include "chrome/browser/ui/chrome_pages.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" class Profile; diff --git a/chrome/browser/ui/chrome_pages.h b/chrome/browser/ui/chrome_pages.h index 9d943f7..3420c5d 100644 --- a/chrome/browser/ui/chrome_pages.h +++ b/chrome/browser/ui/chrome_pages.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/content_settings_types.h" class Browser; diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index 883ea76..4536b8d 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -29,7 +29,7 @@ #include "chrome/browser/ui/cocoa/tabs/tab_strip_view.h" #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/singleton_tabs.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/commands/commands_handler.h" #include "chrome/common/extensions/api/extension_action/action_info.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 1af06b1..f761bf8 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -29,8 +29,8 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 2f29df6..1bc4224 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -65,11 +65,11 @@ #include "chrome/browser/ui/startup/obsolete_os_infobar_delegate.h" #include "chrome/browser/ui/startup/session_crashed_prompt.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/pinned_tab_codec.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" #include "chrome/browser/ui/webui/sync_promo/sync_promo_trial.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h index 1d17870..1066878 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.h +++ b/chrome/browser/ui/sync/one_click_signin_helper.h @@ -9,7 +9,7 @@ #include "base/gtest_prod_util.h" #include "chrome/browser/sync/profile_sync_service_observer.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc b/chrome/browser/ui/sync/sync_promo_ui.cc index b63325d..83585b6 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.cc +++ b/chrome/browser/ui/sync/sync_promo_ui.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "base/command_line.h" #include "base/prefs/pref_service.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h b/chrome/browser/ui/sync/sync_promo_ui.h index ae67031..48d2f1b 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_ui.h +++ b/chrome/browser/ui/sync/sync_promo_ui.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 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. -#ifndef CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_ -#define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_ +#ifndef CHROME_BROWSER_UI_SYNC_SYNC_PROMO_UI_H_ +#define CHROME_BROWSER_UI_SYNC_SYNC_PROMO_UI_H_ #include <string> @@ -84,4 +84,4 @@ class SyncPromoUI { DISALLOW_COPY_AND_ASSIGN(SyncPromoUI); }; -#endif // CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_UI_H_ +#endif // CHROME_BROWSER_UI_SYNC_SYNC_PROMO_UI_H_ diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index caa0369..abb0c06 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -19,13 +19,13 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/singleton_tabs.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/views/browser_action_view.h" #include "chrome/browser/ui/views/browser_actions_container.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index 68d4fcc..a8147e1 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -107,7 +107,7 @@ #endif #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc index 7be787e..cfafc72 100644 --- a/chrome/browser/ui/webui/ntp/ntp_login_handler.cc +++ b/chrome/browser/ui/webui/ntp/ntp_login_handler.cc @@ -28,8 +28,8 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/browser/web_resource/promo_resource_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index e19ad8a..a93c285 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -31,10 +31,10 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/bookmarks/bookmark_bar_constants.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/browser/ui/webui/ntp/ntp_login_handler.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/browser/ui/webui/sync_setup_handler.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index d939033..89184e2 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc @@ -23,8 +23,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/singleton_tabs.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/installer/util/install_util.h" diff --git a/chrome/browser/ui/webui/signin/login_ui_service.cc b/chrome/browser/ui/webui/signin/login_ui_service.cc index baa07f7..cae530f 100644 --- a/chrome/browser/ui/webui/signin/login_ui_service.cc +++ b/chrome/browser/ui/webui/signin/login_ui_service.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/sync/inline_login_dialog.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/url_constants.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_trial.cc b/chrome/browser/ui/webui/sync_promo/sync_promo_trial.cc index 14517a7..a410d2b 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_trial.cc +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_trial.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "chrome/browser/metrics/metrics_service.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/sync_promo/sync_promo_trial.h b/chrome/browser/ui/webui/sync_promo/sync_promo_trial.h index c4510ea..f522ba9 100644 --- a/chrome/browser/ui/webui/sync_promo/sync_promo_trial.h +++ b/chrome/browser/ui/webui/sync_promo/sync_promo_trial.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_WEBUI_SYNC_PROMO_SYNC_PROMO_TRIAL_H_ #include "base/basictypes.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" class Profile; namespace content { diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 15f03ce..5d353d9 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -29,10 +29,10 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/sync/signin_histogram.h" +#include "chrome/browser/ui/sync/sync_promo_ui.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" -#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index 226475f..99e5121 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1428,6 +1428,8 @@ 'browser/ui/sync/profile_signin_confirmation_helper.cc', 'browser/ui/sync/profile_signin_confirmation_helper.h', 'browser/ui/sync/signin_histogram.h', + 'browser/ui/sync/sync_promo_ui.cc', + 'browser/ui/sync/sync_promo_ui.h', 'browser/ui/sync/tab_contents_synced_tab_delegate.cc', 'browser/ui/sync/tab_contents_synced_tab_delegate.h', 'browser/ui/tab_contents/chrome_web_contents_view_delegate.h', @@ -2308,8 +2310,6 @@ 'browser/ui/webui/sync_internals_ui.h', 'browser/ui/webui/sync_promo/sync_promo_trial.cc', 'browser/ui/webui/sync_promo/sync_promo_trial.h', - 'browser/ui/webui/sync_promo/sync_promo_ui.cc', - 'browser/ui/webui/sync_promo/sync_promo_ui.h', 'browser/ui/webui/sync_setup_handler.cc', 'browser/ui/webui/sync_setup_handler.h', 'browser/ui/webui/tab_modal_confirm_dialog_webui.cc', |