New avatar menu: Don't show "Go incognito" if incognito is disabled by policy

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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/views/profiles/profile_chooser_view.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
+#include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_header_helper.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
@@ skipping 633 matching lines @@
   // has no parent (like in tests) because that will also crash.
   if (sender->parent())
     sender->SetEnabled(false);
 
   if (sender == users_button_) {
     profiles::ShowUserManagerMaybeWithTutorial(browser_->profile());
     // If this is a guest session, also close all the guest browser windows.
     if (browser_->profile()->IsGuestSession())
       profiles::CloseGuestProfileWindows();
   } else if (sender == go_incognito_button_) {
-    DCHECK(!browser_->profile()->IsGuestSession());
+    DCHECK(ShouldShowGoIncognito());
     chrome::NewIncognitoWindow(browser_);
   } else if (sender == lock_button_) {
     profiles::LockProfile(browser_->profile());
     PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_LOCK);
   } else if (sender == auth_error_email_button_) {
     ShowView(profiles::BUBBLE_VIEW_MODE_GAIA_REAUTH, avatar_menu_.get());
   } else if (sender == tutorial_ok_button_) {
     // If the user manually dismissed the tutorial, never show it again by
     // setting the number of times shown to the maximum plus 1, so that later we
     // could distinguish between the dismiss case and the case when the tutorial
@@ skipping 143 matching lines @@
       return true;
 
     profiles::UpdateProfileName(profile, new_profile_name);
     PostActionPerformed(ProfileMetrics::PROFILE_DESKTOP_MENU_EDIT_NAME);
     current_profile_name_->ShowReadOnlyView();
     return true;
   }
   return false;
 }
 
 void ProfileChooserView::PostActionPerformed(

[msw, 2014/08/04 17:09:40]

nit: please reorder this definition to match its declaration.

[Marc Treib, 2014/08/05 08:21:33]

Done.

     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }
 
 views::View* ProfileChooserView::CreateProfileChooserView(
     AvatarMenu* avatar_menu,
     profiles::TutorialMode last_tutorial_mode) {
   // TODO(guohui, noms): the view should be customized based on whether new
   // profile management preview is enabled or not.
@@ skipping 396 matching lines @@
       l10n_util::GetStringUTF16(IDS_PROFILES_EXIT_GUEST) :
       l10n_util::GetStringUTF16(IDS_PROFILES_SWITCH_USERS_BUTTON);
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   users_button_ = new BackgroundColorHoverButton(
       this,
       text,
       *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_AVATAR));
   layout->StartRow(1, 0);
   layout->AddView(users_button_);
 
-  if (!browser_->profile()->IsGuestSession()) {
+  if (ShouldShowGoIncognito()) {
     layout->StartRow(1, 0);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
 
     // TODO(noms): Use the correct incognito icon when it's available.
     go_incognito_button_ = new BackgroundColorHoverButton(
         this,
         l10n_util::GetStringUTF16(IDS_PROFILES_GO_INCOGNITO_BUTTON),
         *rb->GetImageSkiaNamed(IDR_ICON_PROFILES_MENU_AVATAR));
     layout->StartRow(1, 0);
     layout->AddView(go_incognito_button_);
@@ skipping 270 matching lines @@
       gfx::ALIGN_CENTER);
   layout->StartRowWithPadding(
       1, 0, 0, views::kUnrelatedControlVerticalSpacing);
   layout->AddView(end_preview_and_relaunch_button_);
 
   TitleCard* title_card = new TitleCard(
       IDS_PROFILES_END_PREVIEW, this, &end_preview_cancel_button_);
   return TitleCard::AddPaddedTitleCard(
       view, title_card, kFixedAccountRemovalViewWidth);
 }
+
+bool ProfileChooserView::ShouldShowGoIncognito() const {
+  bool incognito_available =
+      IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
+          IncognitoModePrefs::DISABLED;
+  return incognito_available && !browser_->profile()->IsGuestSession();
+}