Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4889)

Unified Diff: chrome/browser/chromeos/login/webui_login_view.h

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index 2b47013230cd3fd964197ae188d8e5b146ab62a6..893546a18f3034c555527ba1c23239efc83721c1 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -35,7 +35,6 @@ class StatusAreaViewChromeos;
class WebUILoginView : public views::WidgetDelegateView,
public StatusAreaButton::Delegate,
public TabContentsDelegate,
- public LoginHtmlDialog::Delegate,
public TabFirstRenderWatcher::Delegate {
public:
static const int kStatusAreaCornerPadding;
@@ -76,6 +75,7 @@ class WebUILoginView : public views::WidgetDelegateView,
protected:
// Overridden from views::View:
virtual void Layout() OVERRIDE;
+ virtual void OnLocaleChanged() OVERRIDE;
virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
// Overridden from StatusAreaButton::Delegate:
@@ -87,10 +87,6 @@ class WebUILoginView : public views::WidgetDelegateView,
virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
- // Overridden from LoginHtmlDialog::Delegate:
- virtual void OnDialogClosed() OVERRIDE;
- virtual void OnLocaleChanged() OVERRIDE;
-
// TabFirstRenderWatcher::Delegate implementation.
virtual void OnRenderHostCreated(RenderViewHost* host) OVERRIDE;
virtual void OnTabMainFrameLoaded() OVERRIDE;
« no previous file with comments | « chrome/browser/chromeos/login/screen_locker_views.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698