[Mac] Update location bar colors when change themes in Material Design.

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"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 567 matching lines @@
   DCHECK(vectorIconId != gfx::VectorIconId::VECTOR_ICON_NONE);
   NSImage* image = NSImageFromImageSkia(gfx::CreateVectorIcon(
       vectorIconId, kIconSize, vectorIconColor));
 
   location_icon_decoration_->SetImage(image);
   ev_bubble_decoration_->SetImage(image);
 
   Layout();
 }
 
-void LocationBarViewMac::OnAddedToWindow() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
+void LocationBarViewMac::UpdateColorsToMatchTheme() {
+  if (!ui::MaterialDesignController::IsModeMaterial() ||
+      ![[field_ window] inIncognitoMode]) {
     return;
   }
 
   // Update the location-bar icon.
   UpdateLocationIcon();
 
-  // Make sure we're displaying the correct star color for a dark location bar.
-  if ([[field_ window] inIncognitoModeWithSystemTheme]) {
-    star_decoration_->SetStarred(star_decoration_->starred(), true);
-  }
+  // 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 inDarkMode = [[field_ window] inIncognitoModeWithSystemTheme];
+  star_decoration_->SetStarred(star_decoration_->starred(), inDarkMode);
+
+  // Update the appearance of the text in the Omnibox.
+  omnibox_view_->Update();
+}
+
+void LocationBarViewMac::OnAddedToWindow() {
+  UpdateColorsToMatchTheme();
+}
+
+void LocationBarViewMac::OnThemeChanged() {
+  UpdateColorsToMatchTheme();
 }
 
 void LocationBarViewMac::OnChanged() {
   NSImage* image = nil;
   if (ui::MaterialDesignController::IsModeMaterial()) {
     UpdateLocationIcon();
   } else {
     const int resource_id = omnibox_view_->GetIcon();
     image = OmniboxViewMac::ImageForResource(resource_id);
     location_icon_decoration_->SetImage(image);
@@ skipping 176 matching lines @@
   return zoom_decoration_->UpdateIfNecessary(
       ui_zoom::ZoomController::FromWebContents(web_contents),
       default_zoom_changed,
       inDarkMode);
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }