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

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

Issue 9181012: Don't activate a window if screen is locked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_window_aura.h" 5 #include "chrome/browser/chromeos/login/lock_window_aura.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 24 matching lines...) Expand all
35 } 35 }
36 36
37 LockWindowAura::~LockWindowAura() { 37 LockWindowAura::~LockWindowAura() {
38 } 38 }
39 39
40 void LockWindowAura::Init() { 40 void LockWindowAura::Init() {
41 views::Widget::InitParams params( 41 views::Widget::InitParams params(
42 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 42 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
43 params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize()); 43 params.bounds = gfx::Rect(aura::RootWindow::GetInstance()->GetHostSize());
44 views::Widget::Init(params); 44 views::Widget::Init(params);
45 // TODO(flackr): Use a property to specify this container rather than 45 GetNativeView()->set_stops_event_propagation(true);
46 // depending on shell implementation. 46 // Let the shell pick the container.
47 ash::Shell::GetInstance()->GetContainer( 47 GetNativeView()->SetParent(NULL);
48 ash::internal::kShellWindowId_LockScreenContainer)->
49 AddChild(GetNativeView());
50 } 48 }
51 49
52 } // namespace chromeos 50 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698