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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/screen_locker_views.cc

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
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | chrome/browser/chromeos/status/input_method_menu.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screen_locker_views.cc
diff --git a/chrome/browser/chromeos/login/screen_locker_views.cc b/chrome/browser/chromeos/login/screen_locker_views.cc
index a00434148916eca8e578dea10fbb76c5c93b4342..5f21d4cc969bef27aa1a285af5c1b005f3190e6f 100644
--- a/chrome/browser/chromeos/login/screen_locker_views.cc
+++ b/chrome/browser/chromeos/login/screen_locker_views.cc
@@ -389,7 +389,13 @@ class ScreenLockerBackgroundView
views::View* screen_lock_view)
: lock_widget_(lock_widget),
screen_lock_view_(screen_lock_view) {
- set_screen_mode(chromeos::StatusAreaViewChromeos::SCREEN_LOCKER_MODE);
+ chromeos::StatusAreaViewChromeos::screen_mode =
+ chromeos::StatusAreaViewChromeos::SCREEN_LOCKER_MODE;
+ }
+
+ virtual ~ScreenLockerBackgroundView() {
+ chromeos::StatusAreaViewChromeos::screen_mode =
+ chromeos::StatusAreaViewChromeos::BROWSER_MODE;
}
virtual void Layout() OVERRIDE {
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | chrome/browser/chromeos/status/input_method_menu.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698