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

Side by Side Diff: ash/test/test_shell_delegate.cc

Issue 9788001: Remove stops_event_propagation from Window, since it's broken. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 "ash/test/test_shell_delegate.h" 5 #include "ash/test/test_shell_delegate.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/screenshot_delegate.h" 9 #include "ash/screenshot_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/shell_window_ids.h" 11 #include "ash/shell_window_ids.h"
12 #include "grit/ui_resources.h" 12 #include "grit/ui_resources.h"
13 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
14 14
15 namespace ash { 15 namespace ash {
16 namespace test { 16 namespace test {
17 17
18 TestShellDelegate::TestShellDelegate() { 18 TestShellDelegate::TestShellDelegate() : locked_(false) {
19 } 19 }
20 20
21 TestShellDelegate::~TestShellDelegate() { 21 TestShellDelegate::~TestShellDelegate() {
22 } 22 }
23 23
24 views::Widget* TestShellDelegate::CreateStatusArea() { 24 views::Widget* TestShellDelegate::CreateStatusArea() {
25 return NULL; 25 return NULL;
26 } 26 }
27 27
28 #if defined(OS_CHROMEOS)
29 void TestShellDelegate::LockScreen() { 28 void TestShellDelegate::LockScreen() {
29 locked_ = true;
30 } 30 }
31 #endif 31
32 void TestShellDelegate::UnlockScreen() {
33 locked_ = false;
34 }
35
36 bool TestShellDelegate::IsScreenLocked() const {
37 return locked_;
38 }
32 39
33 void TestShellDelegate::Exit() { 40 void TestShellDelegate::Exit() {
34 } 41 }
35 42
36 AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { 43 AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
37 return NULL; 44 return NULL;
38 } 45 }
39 46
40 std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList( 47 std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList(
41 CycleSource source) const { 48 CycleSource source) const {
(...skipping 18 matching lines...) Expand all
60 return NULL; 67 return NULL;
61 } 68 }
62 69
63 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate( 70 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate(
64 SystemTray* tray) { 71 SystemTray* tray) {
65 return NULL; 72 return NULL;
66 } 73 }
67 74
68 } // namespace test 75 } // namespace test
69 } // namespace ash 76 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698