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

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

Issue 9132004: Makes Ctrl-Shift-L work in AppList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed accelerator_table 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
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 12 matching lines...) Expand all
23 void TestShellDelegate::CreateNewWindow() { 23 void TestShellDelegate::CreateNewWindow() {
24 } 24 }
25 25
26 views::Widget* TestShellDelegate::CreateStatusArea() { 26 views::Widget* TestShellDelegate::CreateStatusArea() {
27 return NULL; 27 return NULL;
28 } 28 }
29 29
30 void TestShellDelegate::BuildAppListModel(AppListModel* model) { 30 void TestShellDelegate::BuildAppListModel(AppListModel* model) {
31 } 31 }
32 32
33 #if defined(OS_CHROMEOS)
34 void TestShellDelegate::LockScreen() {
35 }
36 #endif
37
33 AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { 38 AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() {
34 return NULL; 39 return NULL;
35 } 40 }
36 41
37 std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList( 42 std::vector<aura::Window*> TestShellDelegate::GetCycleWindowList(
38 CycleSource source, 43 CycleSource source,
39 CycleOrder order) const { 44 CycleOrder order) const {
40 // We just use the Shell's default container of windows, so tests can be 45 // We just use the Shell's default container of windows, so tests can be
41 // written with the usual CreateTestWindowWithId() calls. But window cycling 46 // written with the usual CreateTestWindowWithId() calls. But window cycling
42 // expects the topmost window at the front of the list, so reverse the order. 47 // expects the topmost window at the front of the list, so reverse the order.
(...skipping 10 matching lines...) Expand all
53 bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) { 58 bool TestShellDelegate::ConfigureLauncherItem(LauncherItem* item) {
54 return true; 59 return true;
55 } 60 }
56 61
57 int TestShellDelegate::GetBrowserShortcutResourceId() { 62 int TestShellDelegate::GetBrowserShortcutResourceId() {
58 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; 63 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
59 } 64 }
60 65
61 } // namespace test 66 } // namespace test
62 } // namespace ash 67 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698