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

Side by Side Diff: chrome/browser/chromeos/login/webui_screen_locker.cc

Issue 9355059: Renaming virtual setters/getters in UserManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: year Created 8 years, 9 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/webui_screen_locker.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/cros/cros_library.h" 10 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 lock_window->set_observer(this); 51 lock_window->set_observer(this);
52 lock_window_ = lock_window->GetWidget(); 52 lock_window_ = lock_window->GetWidget();
53 WebUILoginView::Init(lock_window_); 53 WebUILoginView::Init(lock_window_);
54 lock_window_->SetContentsView(this); 54 lock_window_->SetContentsView(this);
55 lock_window_->Show(); 55 lock_window_->Show();
56 OnWindowCreated(); 56 OnWindowCreated();
57 LoadURL(GURL(kLoginURL)); 57 LoadURL(GURL(kLoginURL));
58 lock_window->Grab(webui_login_); 58 lock_window->Grab(webui_login_);
59 59
60 // User list consisting of a single logged-in user. 60 // User list consisting of a single logged-in user.
61 UserList users(1, &chromeos::UserManager::Get()->logged_in_user()); 61 UserList users(1, &chromeos::UserManager::Get()->GetLoggedInUser());
62 login_display_.reset(new WebUILoginDisplay(this)); 62 login_display_.reset(new WebUILoginDisplay(this));
63 login_display_->set_background_bounds(bounds); 63 login_display_->set_background_bounds(bounds);
64 login_display_->Init(users, false, true, false); 64 login_display_->Init(users, false, true, false);
65 65
66 static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen( 66 static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen(
67 login_display_.get()); 67 login_display_.get());
68 68
69 registrar_.Add(this, 69 registrar_.Add(this,
70 chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED, 70 chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
71 content::NotificationService::AllSources()); 71 content::NotificationService::AllSources());
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 207
208 StatusAreaViewChromeos::ScreenMode WebUIScreenLocker::GetScreenMode() { 208 StatusAreaViewChromeos::ScreenMode WebUIScreenLocker::GetScreenMode() {
209 return StatusAreaViewChromeos::SCREEN_LOCKER_MODE; 209 return StatusAreaViewChromeos::SCREEN_LOCKER_MODE;
210 } 210 }
211 211
212 views::Widget::InitParams::Type WebUIScreenLocker::GetStatusAreaWidgetType() { 212 views::Widget::InitParams::Type WebUIScreenLocker::GetStatusAreaWidgetType() {
213 return views::Widget::InitParams::TYPE_POPUP; 213 return views::Widget::InitParams::TYPE_POPUP;
214 } 214 }
215 215
216 } // namespace chromeos 216 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698