[Material Design] Update Website Setting Icons in Omnibox on OSX

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

 // Copyright 2012 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 189 matching lines @@
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
 
   // |controller| may be nullptr due to lazy initialization.
   autofill::SaveCardBubbleControllerImpl* controller =
       autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents);
   bool enabled = controller && controller->IsIconVisible();
   command_updater()->UpdateCommandEnabled(IDC_SAVE_CREDIT_CARD_FOR_PAGE,
                                           enabled);
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
-  save_credit_card_decoration_->SetIcon(in_dark_mode);
+  save_credit_card_decoration_->SetIcon(IsLocationBarDark());
   save_credit_card_decoration_->SetVisible(enabled);
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::UpdatePageActions() {
   RefreshPageActionDecorations();
   Layout();
 
   [field_ updateMouseTracking];
   [field_ setNeedsDisplay:YES];
@@ skipping 115 matching lines @@
 }
 
 bool LocationBarViewMac::IsEditable() {
   return [field_ isEditable] ? true : false;
 }
 
 void LocationBarViewMac::SetStarred(bool starred) {
   if (star_decoration_->starred() == starred)
     return;
 
-  star_decoration_->SetStarred(starred,
-      [[field_ window] inIncognitoModeWithSystemTheme]);
+  star_decoration_->SetStarred(starred, IsLocationBarDark());
   UpdateBookmarkStarVisibility();
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::SetTranslateIconLit(bool on) {
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
-  translate_decoration_->SetLit(on, in_dark_mode);
+  translate_decoration_->SetLit(on, IsLocationBarDark());
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::ZoomChangedForActiveTab(bool can_show_bubble) {
   bool changed = UpdateZoomDecoration(/*default_zoom_changed=*/false);
   if (changed)
     OnDecorationsChanged();
 
   if (can_show_bubble && zoom_decoration_->IsVisible())
     zoom_decoration_->ShowBubble(YES);
@@ skipping 190 matching lines @@
   else
     omnibox_view_->Update();
   OnChanged();
 }
 
 void LocationBarViewMac::UpdateWithoutTabRestore() {
   Update(nullptr);
 }
 
 void LocationBarViewMac::UpdateLocationIcon() {
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
+  bool in_dark_mode = IsLocationBarDark();
 
   SkColor vector_icon_color = gfx::kPlaceholderColor;
   gfx::VectorIconId vector_icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   int icon_size = kDefaultIconSize;
   if (ShouldShowEVBubble()) {
     vector_icon_id = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP;
     vector_icon_color = gfx::kGoogleGreen700;
     icon_size = kMaterialSmallIconSize;
   } else {
     vector_icon_id = omnibox_view_->GetVectorIcon(in_dark_mode);
@@ skipping 19 matching lines @@
       ![[field_ window] inIncognitoMode]) {
     return;
   }
 
   // Update the location-bar icon.
   UpdateLocationIcon();
 
   // Make sure we're displaying the correct star color for Incognito mode. If
   // the window is in Incognito mode, switching between a theme and no theme
   // can move the window in and out of dark mode.
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
-  star_decoration_->SetStarred(star_decoration_->starred(), in_dark_mode);
+  star_decoration_->SetStarred(star_decoration_->starred(),
+                               IsLocationBarDark());
 
   // Update the appearance of the text in the Omnibox.
   omnibox_view_->Update();
 }
 
 void LocationBarViewMac::OnAddedToWindow() {
   UpdateColorsToMatchTheme();
 }
 
 void LocationBarViewMac::OnThemeChanged() {
@@ skipping 31 matching lines @@
 
 WebContents* LocationBarViewMac::GetWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 bool LocationBarViewMac::ShouldShowEVBubble() const {
   return (GetToolbarModel()->GetSecurityLevel(false) ==
           security_state::SecurityStateModel::EV_SECURE);
 }
 
+bool LocationBarViewMac::IsLocationBarDark() const {
+  return [[field_ window] inIncognitoModeWithSystemTheme];
+}
+
 NSImage* LocationBarViewMac::GetKeywordImage(const base::string16& keyword) {
   const TemplateURL* template_url = TemplateURLServiceFactory::GetForProfile(
       profile())->GetTemplateURLForKeyword(keyword);
   if (template_url &&
       (template_url->GetType() == TemplateURL::OMNIBOX_API_EXTENSION)) {
     return extensions::OmniboxAPI::Get(profile())->
         GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
   }
 
   return ui::MaterialDesignController::IsModeMaterial()
@@ skipping 119 matching lines @@
     return;
 
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
   translate::LanguageState& language_state =
       ChromeTranslateClient::FromWebContents(web_contents)->GetLanguageState();
   bool enabled = language_state.translate_enabled();
   command_updater()->UpdateCommandEnabled(IDC_TRANSLATE_PAGE, enabled);
   translate_decoration_->SetVisible(enabled);
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
   translate_decoration_->SetLit(language_state.IsPageTranslated(),
-                                in_dark_mode);
+                                IsLocationBarDark());
 }
 
 bool LocationBarViewMac::UpdateZoomDecoration(bool default_zoom_changed) {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
 
-  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
   return zoom_decoration_->UpdateIfNecessary(
       ui_zoom::ZoomController::FromWebContents(web_contents),
-      default_zoom_changed,
-      in_dark_mode);
+      default_zoom_changed, IsLocationBarDark());
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }