diff options
| author | fdoray@chromium.org <fdoray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 03:15:16 +0000 |
|---|---|---|
| committer | fdoray@chromium.org <fdoray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 03:15:16 +0000 |
| commit | 3d27d278f8039da88cca8e84830a1ff7028e760a (patch) | |
| tree | e75d0c312dbd3d2bda1fbbec0e80c44e7247c506 /chrome/browser/ui/browser_command_controller.cc | |
| parent | ff971ba37cbba8fb17bbdc0d447af0c5f27cd7ac (diff) | |
| download | chromium_src-3d27d278f8039da88cca8e84830a1ff7028e760a.zip chromium_src-3d27d278f8039da88cca8e84830a1ff7028e760a.tar.gz chromium_src-3d27d278f8039da88cca8e84830a1ff7028e760a.tar.bz2 | |
No bookmark sync promo if sync is disabled by policy.
Prevents the bookmark sync promo to be displayed when sync is disabled by policy.
It's possible to sign in to Chrome without enabling sync. For that reason, some sync promos have become sign in promos lately. In this CL, most functions from sync_promo_ui.h have been moved to a new chrome/browser/signin/signin_promo.h file to be consistent with that change.
TEST=
1. Start Chrome with command line flags --disable-sync and --enable-bookmark-sync-promo.
2. If necessary, sign out of Chrome (hot-dog menu > Settings > Disconnect you Google Account...).
2. Observe that no sync promo is displayed in the bookmark bubble.
BUG=262950
Review URL: https://chromiumcodereview.appspot.com/19804009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_command_controller.cc')
| -rw-r--r-- | chrome/browser/ui/browser_command_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 8726534..7429d58 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -17,6 +17,7 @@ #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #include "chrome/browser/shell_integration.h" +#include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" @@ -24,7 +25,6 @@ #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/common/content_restriction.h" @@ -684,7 +684,7 @@ void BrowserCommandController::ExecuteCommandWithDisposition( ShowHelp(browser_, HELP_SOURCE_MENU); break; case IDC_SHOW_SIGNIN: - ShowBrowserSignin(browser_, SyncPromoUI::SOURCE_MENU); + ShowBrowserSignin(browser_, signin::SOURCE_MENU); break; case IDC_TOGGLE_SPEECH_INPUT: ToggleSpeechInput(browser_); |