summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/chromeos')
-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
14 files changed, 15 insertions, 15 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.