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

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

Issue 2867173003: cros: Move LockWindow from chrome to ash (Closed)
Patch Set: Reorder patches so view -> ui lands first Created 3 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/lock/webui_screen_locker.h" 5 #include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/feature_list.h" 8 #include "base/feature_list.h"
9 #include "base/metrics/histogram_macros.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 ResetKeyboardOverscrollOverride(); 145 ResetKeyboardOverscrollOverride();
146 146
147 RequestPreload(); 147 RequestPreload();
148 } 148 }
149 149
150 void WebUIScreenLocker::LockScreen() { 150 void WebUIScreenLocker::LockScreen() {
151 gfx::Rect bounds = display::Screen::GetScreen()->GetPrimaryDisplay().bounds(); 151 gfx::Rect bounds = display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
152 152
153 lock_time_ = base::TimeTicks::Now(); 153 lock_time_ = base::TimeTicks::Now();
154 lock_window_ = new LockWindow(); 154 lock_window_ = new ash::LockWindow();
155 lock_window_->AddObserver(this); 155 lock_window_->AddObserver(this);
156 156
157 Init(); 157 Init();
158 content::WebContentsObserver::Observe(web_view()->GetWebContents()); 158 content::WebContentsObserver::Observe(web_view()->GetWebContents());
159 159
160 lock_window_->SetContentsView(this); 160 lock_window_->SetContentsView(this);
161 lock_window_->SetBounds(bounds); 161 lock_window_->SetBounds(bounds);
162 lock_window_->Show(); 162 lock_window_->Show();
163 LoadURL(GURL(kLoginURL)); 163 LoadURL(GURL(kLoginURL));
164 OnLockWindowReady(); 164 OnLockWindowReady();
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 } 436 }
437 437
438 if (GetOobeUI()) { 438 if (GetOobeUI()) {
439 const gfx::Size& size = primary_display.size(); 439 const gfx::Size& size = primary_display.size();
440 GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(), 440 GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
441 size.height()); 441 size.height());
442 } 442 }
443 } 443 }
444 444
445 } // namespace chromeos 445 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/lock/webui_screen_locker.h ('k') | chrome/browser/chromeos/login/ui/lock_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698