summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/chromeos/login/background_view.cc2
-rw-r--r--chrome/browser/chromeos/login/background_view.h2
-rw-r--r--chrome/browser/chromeos/login/eula_view.cc2
-rw-r--r--chrome/browser/chromeos/login/eula_view.h2
-rw-r--r--chrome/browser/chromeos/login/network_selection_view.cc2
-rw-r--r--chrome/browser/chromeos/login/network_selection_view.h2
-rw-r--r--chrome/browser/chromeos/login/new_user_view.cc2
-rw-r--r--chrome/browser/chromeos/login/new_user_view.h2
-rw-r--r--chrome/browser/chromeos/login/oobe_progress_bar.cc2
-rw-r--r--chrome/browser/chromeos/login/oobe_progress_bar.h2
-rw-r--r--chrome/browser/chromeos/login/user_image_view.cc2
-rw-r--r--chrome/browser/chromeos/login/user_image_view.h2
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.cc4
-rw-r--r--chrome/browser/chromeos/status/language_menu_button.h2
-rw-r--r--chrome/browser/views/bookmark_bar_instructions_view.cc4
-rw-r--r--chrome/browser/views/bookmark_bar_instructions_view.h4
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc2
-rw-r--r--chrome/browser/views/bookmark_bar_view.h2
-rw-r--r--chrome/browser/views/constrained_window_win.cc4
-rw-r--r--chrome/browser/views/download_shelf_view.cc2
-rw-r--r--chrome/browser/views/download_shelf_view.h4
-rw-r--r--chrome/browser/views/extensions/extension_shelf.cc2
-rw-r--r--chrome/browser/views/extensions/extension_shelf.h2
-rw-r--r--chrome/browser/views/find_bar_view.cc4
-rw-r--r--chrome/browser/views/find_bar_view.h2
-rw-r--r--chrome/browser/views/tabs/base_tab.cc3
-rw-r--r--chrome/browser/views/tabs/base_tab.h2
-rw-r--r--chrome/browser/views/tabs/tab.cc3
-rw-r--r--chrome/browser/views/tabs/tab.h2
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc2
-rw-r--r--chrome/browser/views/tabs/tab_strip.h2
-rw-r--r--chrome/browser/views/toolbar_view.cc2
-rw-r--r--chrome/browser/views/toolbar_view.h2
-rw-r--r--views/view.cc11
-rw-r--r--views/view.h22
-rw-r--r--views/widget/root_view.cc7
-rw-r--r--views/widget/root_view.h4
-rw-r--r--views/window/non_client_view.cc2
38 files changed, 64 insertions, 62 deletions
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 01f0d6e..8ba96a5 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -164,7 +164,7 @@ bool BackgroundView::IsScreenLockerMode() const {
return false;
}
-void BackgroundView::LocaleChanged() {
+void BackgroundView::OnLocaleChanged() {
Layout();
SchedulePaint();
}
diff --git a/chrome/browser/chromeos/login/background_view.h b/chrome/browser/chromeos/login/background_view.h
index 65438ca..cd6279f 100644
--- a/chrome/browser/chromeos/login/background_view.h
+++ b/chrome/browser/chromeos/login/background_view.h
@@ -58,7 +58,7 @@ class BackgroundView : public views::View, public StatusAreaHost {
virtual void Paint(gfx::Canvas* canvas);
virtual void Layout();
virtual void ChildPreferredSizeChanged(View* child);
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
// Overridden from StatusAreaHost:
virtual Profile* GetProfile() const { return NULL; }
diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc
index 2cdaff2..ad3dd25 100644
--- a/chrome/browser/chromeos/login/eula_view.cc
+++ b/chrome/browser/chromeos/login/eula_view.cc
@@ -208,7 +208,7 @@ void EulaView::UpdateLocalizedStrings() {
////////////////////////////////////////////////////////////////////////////////
// views::View: implementation:
-void EulaView::LocaleChanged() {
+void EulaView::OnLocaleChanged() {
UpdateLocalizedStrings();
Layout();
}
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index c82f7ce..2a59345 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -81,7 +81,7 @@ class EulaView
protected:
// views::View implementation.
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
// views::ButtonListener implementation.
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc
index 2e206a1..b2735bd 100644
--- a/chrome/browser/chromeos/login/network_selection_view.cc
+++ b/chrome/browser/chromeos/login/network_selection_view.cc
@@ -156,7 +156,7 @@ void NetworkSelectionView::ChildPreferredSizeChanged(View* child) {
SchedulePaint();
}
-void NetworkSelectionView::LocaleChanged() {
+void NetworkSelectionView::OnLocaleChanged() {
UpdateLocalizedStrings();
NetworkModelChanged();
// Explicitly set selected item - index 0 is a localized string.
diff --git a/chrome/browser/chromeos/login/network_selection_view.h b/chrome/browser/chromeos/login/network_selection_view.h
index 09f8f82..9bfdac1 100644
--- a/chrome/browser/chromeos/login/network_selection_view.h
+++ b/chrome/browser/chromeos/login/network_selection_view.h
@@ -59,7 +59,7 @@ class NetworkSelectionView : public views::View {
protected:
// Overridden from views::View.
virtual void ChildPreferredSizeChanged(View* child);
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
private:
// Delete and recreate native controls that
diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index 397821d..79c8d95 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -198,7 +198,7 @@ void NewUserView::UpdateLocalizedStrings() {
languages_menubutton_->SetText(language_switch_menu_.GetCurrentLocaleName());
}
-void NewUserView::LocaleChanged() {
+void NewUserView::OnLocaleChanged() {
UpdateLocalizedStrings();
Layout();
SchedulePaint();
diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h
index 8befdb8..e8623bf 100644
--- a/chrome/browser/chromeos/login/new_user_view.h
+++ b/chrome/browser/chromeos/login/new_user_view.h
@@ -110,7 +110,7 @@ class NewUserView : public views::View,
virtual void NativeViewHierarchyChanged(bool attached,
gfx::NativeView native_view,
views::RootView* root_view);
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
private:
// Enables/disables input controls (textfields, buttons).
diff --git a/chrome/browser/chromeos/login/oobe_progress_bar.cc b/chrome/browser/chromeos/login/oobe_progress_bar.cc
index 0da6853..0bfc7d6 100644
--- a/chrome/browser/chromeos/login/oobe_progress_bar.cc
+++ b/chrome/browser/chromeos/login/oobe_progress_bar.cc
@@ -122,7 +122,7 @@ void OobeProgressBar::Paint(gfx::Canvas* canvas) {
}
}
-void OobeProgressBar::LocaleChanged() {
+void OobeProgressBar::OnLocaleChanged() {
SchedulePaint();
}
diff --git a/chrome/browser/chromeos/login/oobe_progress_bar.h b/chrome/browser/chromeos/login/oobe_progress_bar.h
index 35e8c80..da68db3 100644
--- a/chrome/browser/chromeos/login/oobe_progress_bar.h
+++ b/chrome/browser/chromeos/login/oobe_progress_bar.h
@@ -36,7 +36,7 @@ class OobeProgressBar : public views::View {
protected:
// Overridden from View:
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
private:
static void InitClass();
diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc
index eb93af3..3d8c18f 100644
--- a/chrome/browser/chromeos/login/user_image_view.cc
+++ b/chrome/browser/chromeos/login/user_image_view.cc
@@ -147,7 +147,7 @@ void UserImageView::OnVideoImageClicked() {
ok_button_->RequestFocus();
}
-void UserImageView::LocaleChanged() {
+void UserImageView::OnLocaleChanged() {
UpdateLocalizedStrings();
Layout();
}
diff --git a/chrome/browser/chromeos/login/user_image_view.h b/chrome/browser/chromeos/login/user_image_view.h
index 83e1b45..61a0ace 100644
--- a/chrome/browser/chromeos/login/user_image_view.h
+++ b/chrome/browser/chromeos/login/user_image_view.h
@@ -61,7 +61,7 @@ class UserImageView : public views::View,
protected:
// views::View overrides:
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
private:
// Delete and recreate native controls that fail to update preferred size
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index 169640d..993a0b0 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -446,7 +446,7 @@ void LanguageMenuButton::ImePropertiesChanged(InputMethodLibrary* obj) {
////////////////////////////////////////////////////////////////////////////////
// views::View implementation:
-void LanguageMenuButton::LocaleChanged() {
+void LanguageMenuButton::OnLocaleChanged() {
const InputMethodDescriptor& input_method =
CrosLibrary::Get()->GetInputMethodLibrary()->current_input_method();
UpdateIndicatorFromInputMethod(input_method);
diff --git a/chrome/browser/chromeos/status/language_menu_button.h b/chrome/browser/chromeos/status/language_menu_button.h
index ec5d2e2..abc694d 100644
--- a/chrome/browser/chromeos/status/language_menu_button.h
+++ b/chrome/browser/chromeos/status/language_menu_button.h
@@ -78,7 +78,7 @@ class LanguageMenuButton : public views::MenuButton,
protected:
// views::View implementation.
- virtual void LocaleChanged();
+ virtual void OnLocaleChanged();
private:
// views::ViewMenuDelegate implementation.
diff --git a/chrome/browser/views/bookmark_bar_instructions_view.cc b/chrome/browser/views/bookmark_bar_instructions_view.cc
index 4b625d9..895ae0c 100644
--- a/chrome/browser/views/bookmark_bar_instructions_view.cc
+++ b/chrome/browser/views/bookmark_bar_instructions_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -75,7 +75,7 @@ void BookmarkBarInstructionsView::Layout() {
}
}
-void BookmarkBarInstructionsView::ThemeChanged() {
+void BookmarkBarInstructionsView::OnThemeChanged() {
UpdateColors();
}
diff --git a/chrome/browser/views/bookmark_bar_instructions_view.h b/chrome/browser/views/bookmark_bar_instructions_view.h
index aa60c66..c16b536 100644
--- a/chrome/browser/views/bookmark_bar_instructions_view.h
+++ b/chrome/browser/views/bookmark_bar_instructions_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -37,7 +37,7 @@ class BookmarkBarInstructionsView : public views::View,
// View overrides.
virtual gfx::Size GetPreferredSize();
virtual void Layout();
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
virtual void ViewHierarchyChanged(bool is_add,
views::View* parent,
views::View* child);
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index 26baaac..2ea1c66 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -1325,7 +1325,7 @@ void BookmarkBarView::Observe(NotificationType type,
}
}
-void BookmarkBarView::ThemeChanged() {
+void BookmarkBarView::OnThemeChanged() {
UpdateColors();
}
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index 5c473812..78ceb89 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -382,7 +382,7 @@ class BookmarkBarView : public DetachableToolbarView,
const NotificationDetails& details);
// Overridden from views::View.
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// If the ModelChangedListener is non-null, ModelChanged is invoked on it.
void NotifyModelChanged();
diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc
index c8924f0..43bcb05 100644
--- a/chrome/browser/views/constrained_window_win.cc
+++ b/chrome/browser/views/constrained_window_win.cc
@@ -178,7 +178,7 @@ class ConstrainedWindowFrameView
// Overridden from views::View:
virtual void Paint(gfx::Canvas* canvas);
virtual void Layout();
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// Overridden from views::ButtonListener:
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
@@ -372,7 +372,7 @@ void ConstrainedWindowFrameView::Layout() {
client_view_bounds_ = CalculateClientAreaBounds(width(), height());
}
-void ConstrainedWindowFrameView::ThemeChanged() {
+void ConstrainedWindowFrameView::OnThemeChanged() {
InitWindowResources();
}
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index f0c37f1..5c2b606 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -302,7 +302,7 @@ void DownloadShelfView::UpdateButtonColors() {
}
}
-void DownloadShelfView::ThemeChanged() {
+void DownloadShelfView::OnThemeChanged() {
UpdateButtonColors();
}
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 5341436..8ffe53f 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -85,7 +85,7 @@ class DownloadShelfView : public DownloadShelf,
void UpdateButtonColors();
// Overridden from views::View.
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// Called when the "close shelf" animation ended.
void Closed();
diff --git a/chrome/browser/views/extensions/extension_shelf.cc b/chrome/browser/views/extensions/extension_shelf.cc
index 7bb5391..acdb298 100644
--- a/chrome/browser/views/extensions/extension_shelf.cc
+++ b/chrome/browser/views/extensions/extension_shelf.cc
@@ -780,7 +780,7 @@ bool ExtensionShelf::GetAccessibleRole(AccessibilityTypes::Role* role) {
return true;
}
-void ExtensionShelf::ThemeChanged() {
+void ExtensionShelf::OnThemeChanged() {
// Refresh the CSS to update toolstrip text colors from theme.
int count = model_->count();
for (int i = 0; i < count; ++i)
diff --git a/chrome/browser/views/extensions/extension_shelf.h b/chrome/browser/views/extensions/extension_shelf.h
index 79c022a..bf94241 100644
--- a/chrome/browser/views/extensions/extension_shelf.h
+++ b/chrome/browser/views/extensions/extension_shelf.h
@@ -52,7 +52,7 @@ class ExtensionShelf : public DetachableToolbarView,
virtual void OnMouseExited(const views::MouseEvent& event);
virtual void OnMouseEntered(const views::MouseEvent& event);
virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// ExtensionContainer methods:
virtual void OnExtensionMouseEvent(ExtensionView* view);
diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc
index ae78c3c..5af5125 100644
--- a/chrome/browser/views/find_bar_view.cc
+++ b/chrome/browser/views/find_bar_view.cc
@@ -323,7 +323,7 @@ void FindBarView::Layout() {
sz.width(),
sz.height());
// Set the color.
- ThemeChanged();
+ OnThemeChanged();
// Next, the FindNext button to the left the close button.
sz = find_next_button_->GetPreferredSize();
@@ -525,7 +525,7 @@ FindBarHost* FindBarView::find_bar_host() const {
return static_cast<FindBarHost*>(host());
}
-void FindBarView::ThemeChanged() {
+void FindBarView::OnThemeChanged() {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
if (GetThemeProvider()) {
close_button_->SetBackground(
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
index ae49c6df..ab119b9 100644
--- a/chrome/browser/views/find_bar_view.h
+++ b/chrome/browser/views/find_bar_view.h
@@ -77,7 +77,7 @@ class FindBarView : public DropdownBarView,
void UpdateMatchCountAppearance(bool no_match);
// Overridden from views::View.
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// We use a hidden view to grab mouse clicks and bring focus to the find
// text box. This is because although the find text box may look like it
diff --git a/chrome/browser/views/tabs/base_tab.cc b/chrome/browser/views/tabs/base_tab.cc
index 0645022..42169ad 100644
--- a/chrome/browser/views/tabs/base_tab.cc
+++ b/chrome/browser/views/tabs/base_tab.cc
@@ -444,8 +444,7 @@ void BaseTab::ShowContextMenu(views::View* source,
controller()->ShowContextMenu(this, p);
}
-void BaseTab::ThemeChanged() {
- views::View::ThemeChanged();
+void BaseTab::OnThemeChanged() {
LoadThemeImages();
}
diff --git a/chrome/browser/views/tabs/base_tab.h b/chrome/browser/views/tabs/base_tab.h
index bf575e8..8bf19ee 100644
--- a/chrome/browser/views/tabs/base_tab.h
+++ b/chrome/browser/views/tabs/base_tab.h
@@ -129,7 +129,7 @@ class BaseTab : public AnimationDelegate,
bool is_mouse_gesture);
// views::View overrides:
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
// Returns the bounds of the title.
virtual const gfx::Rect& title_bounds() const = 0;
diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc
index b519ab2..f2e9a97 100644
--- a/chrome/browser/views/tabs/tab.cc
+++ b/chrome/browser/views/tabs/tab.cc
@@ -319,8 +319,7 @@ void Tab::Layout() {
title_bounds_.set_x(MirroredLeftPointForRect(title_bounds_));
}
-void Tab::ThemeChanged() {
- BaseTab::ThemeChanged();
+void Tab::OnThemeChanged() {
Tab::LoadTabImages();
}
diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h
index 74b4f87..e99a8fd 100644
--- a/chrome/browser/views/tabs/tab.h
+++ b/chrome/browser/views/tabs/tab.h
@@ -70,7 +70,7 @@ class Tab : public BaseTab {
// Overridden from views::View:
virtual void Paint(gfx::Canvas* canvas);
virtual void Layout();
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
virtual std::string GetClassName() const { return kViewClassName; }
virtual bool HasHitTestMask() const;
virtual void GetHitTestMask(gfx::Path* path) const;
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 4712bd1..318a7e8 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -450,7 +450,7 @@ views::View* TabStrip::GetViewForPoint(const gfx::Point& point) {
return this;
}
-void TabStrip::ThemeChanged() {
+void TabStrip::OnThemeChanged() {
LoadNewTabButtonImage();
}
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
index 0f2b53a..1a2de59 100644
--- a/chrome/browser/views/tabs/tab_strip.h
+++ b/chrome/browser/views/tabs/tab_strip.h
@@ -80,7 +80,7 @@ class TabStrip : public BaseTabStrip,
virtual int OnPerformDrop(const views::DropTargetEvent& event);
virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
virtual views::View* GetViewForPoint(const gfx::Point& point);
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
protected:
// BaseTabStrip overrides:
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index b287bda..598aef3 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -505,7 +505,7 @@ void ToolbarView::Paint(gfx::Canvas* canvas) {
canvas->FillRectInt(SK_ColorBLACK, 0, height() - 1, width(), 1);
}
-void ToolbarView::ThemeChanged() {
+void ToolbarView::OnThemeChanged() {
LoadImages();
}
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
index bf67a84..59f1b68 100644
--- a/chrome/browser/views/toolbar_view.h
+++ b/chrome/browser/views/toolbar_view.h
@@ -119,7 +119,7 @@ class ToolbarView : public AccessibleToolbarView,
virtual gfx::Size GetPreferredSize();
virtual void Layout();
virtual void Paint(gfx::Canvas* canvas);
- virtual void ThemeChanged();
+ virtual void OnThemeChanged();
protected:
diff --git a/views/view.cc b/views/view.cc
index 2c92338..c8e35de 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -667,15 +667,16 @@ bool View::IsFocusable() const {
return focusable_ && IsEnabled() && IsVisible();
}
-void View::ThemeChanged() {
+void View::PropagateThemeChanged() {
for (int i = GetChildViewCount() - 1; i >= 0; --i)
- GetChildViewAt(i)->ThemeChanged();
+ GetChildViewAt(i)->PropagateThemeChanged();
+ OnThemeChanged();
}
-void View::NotifyLocaleChanged() {
- LocaleChanged();
+void View::PropagateLocaleChanged() {
for (int i = GetChildViewCount() - 1; i >= 0; --i)
- GetChildViewAt(i)->NotifyLocaleChanged();
+ GetChildViewAt(i)->PropagateLocaleChanged();
+ OnLocaleChanged();
}
#ifndef NDEBUG
diff --git a/views/view.h b/views/view.h
index fcd0ee7..22c38d0 100644
--- a/views/view.h
+++ b/views/view.h
@@ -976,15 +976,15 @@ class View : public AcceleratorTarget {
// Called when the UI theme has changed, overriding allows individual Views to
// do special cleanup and processing (such as dropping resource caches).
- // Subclasses that override this method must call the base class
- // implementation to ensure child views are processed.
- // Can only be called by subclasses. To dispatch a theme changed notification,
- // call this method on the RootView.
- virtual void ThemeChanged();
+ // To dispatch a theme changed notification, call
+ // RootView::NotifyThemeChanged().
+ virtual void OnThemeChanged() { }
// Called when the locale has changed, overriding allows individual Views to
// update locale-dependent strings.
- virtual void LocaleChanged() { }
+ // To dispatch a locale changed notification, call
+ // RootView::NotifyLocaleChanged().
+ virtual void OnLocaleChanged() { }
#ifndef NDEBUG
// Returns true if the View is currently processing a paint.
@@ -1138,9 +1138,13 @@ class View : public AcceleratorTarget {
gfx::Point start_pt;
};
- // Propagates locale changed notification from the root view downside.
- // Invokes LocaleChanged() for every view in the hierarchy.
- virtual void NotifyLocaleChanged();
+ // Used to propagate theme changed notifications from the root view to all
+ // views in the hierarchy.
+ virtual void PropagateThemeChanged();
+
+ // Used to propagate locale changed notifications from the root view to all
+ // views in the hierarchy.
+ virtual void PropagateLocaleChanged();
// RootView invokes these. These in turn invoke the appropriate OnMouseXXX
// method. If a drag is detected, DoDrag is invoked.
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index cfe7505..91ba511 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -238,13 +238,12 @@ Widget* RootView::GetWidget() const {
return widget_;
}
-void RootView::ThemeChanged() {
- View::ThemeChanged();
+void RootView::NotifyThemeChanged() {
+ View::PropagateThemeChanged();
}
void RootView::NotifyLocaleChanged() {
- // Propagate downside. Note that View::NotifyLocaleChanged() is private.
- View::NotifyLocaleChanged();
+ View::PropagateLocaleChanged();
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index 6694f6a..c749bc8 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -80,11 +80,11 @@ class RootView : public View,
// Public API for broadcasting theme change notifications to this View
// hierarchy.
- virtual void ThemeChanged();
+ void NotifyThemeChanged();
// Public API for broadcasting locale change notifications to this View
// hierarchy.
- virtual void NotifyLocaleChanged();
+ void NotifyLocaleChanged();
// The following event methods are overridden to propagate event to the
// control tree
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index 8fe3346..cf3833e 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -61,7 +61,7 @@ void NonClientView::WindowClosing() {
void NonClientView::UpdateFrame() {
SetFrameView(frame_->CreateFrameViewForWindow());
- GetRootView()->ThemeChanged();
+ GetRootView()->NotifyThemeChanged();
Layout();
SchedulePaint();
frame_->UpdateFrameAfterFrameChange();