Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4482)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/views/profiles/profile_chooser_view.cc

Issue 566933005: Do not display lock for hosted domains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle a null in unit tests Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm ('K') | « chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm ('k') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('j') | components/signin/core/browser/signin_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index 13521e65a0cde7acc9ac5650856fe1c0e5aeee6c..1c3f358b12d608fd0e4a61a7a634d098224ec6ec 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -887,7 +887,8 @@ views::View* ProfileChooserView::CreateProfileChooserView(
const AvatarMenu::Item& item = avatar_menu->GetItemAt(i);
if (item.active) {
option_buttons_view = CreateOptionsView(
- switches::IsNewProfileManagement() && item.signed_in);
+ switches::IsNewProfileManagement() && item.signed_in &&
msw 2014/09/19 21:47:40 nit: should IsNewProfileManagement() be part of pr
Mike Lerman 2014/09/21 00:19:36 Done, here and in the controller.
+ profiles::IsLockAvailable(browser_->profile()));
current_profile_view = CreateCurrentProfileView(item, false);
if (view_mode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) {
switch (tutorial_mode_) {
« chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm ('K') | « chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm ('k') | chrome/browser/ui/webui/options/manage_profile_handler.cc » ('j') | components/signin/core/browser/signin_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698