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

Side by Side Diff: ash/shell/shell_main.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/accelerators/accelerator_controller_unittest.cc ('k') | ash/shell_delegate.h » ('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/launcher/launcher_types.h" 5 #include "ash/launcher/launcher_types.h"
6 #include "ash/shell.h" 6 #include "ash/shell.h"
7 #include "ash/shell_delegate.h" 7 #include "ash/shell_delegate.h"
8 #include "ash/shell_factory.h" 8 #include "ash/shell_factory.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/shell/example_factory.h" 10 #include "ash/shell/example_factory.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ash::shell::ToplevelWindow::CreateParams create_params; 51 ash::shell::ToplevelWindow::CreateParams create_params;
52 create_params.can_resize = true; 52 create_params.can_resize = true;
53 create_params.can_maximize = true; 53 create_params.can_maximize = true;
54 ash::shell::ToplevelWindow::CreateToplevelWindow(create_params); 54 ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
55 } 55 }
56 56
57 virtual views::Widget* CreateStatusArea() OVERRIDE { 57 virtual views::Widget* CreateStatusArea() OVERRIDE {
58 return ash::internal::CreateStatusArea(); 58 return ash::internal::CreateStatusArea();
59 } 59 }
60 60
61 #if defined(CHROME_OS)
62 virtual void LockScreen() OVERRIDE {
63 ash::shell::CreateLockScreen();
64 }
65 #endif
66
61 virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE { 67 virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE {
62 ash::shell::BuildAppListModel(model); 68 ash::shell::BuildAppListModel(model);
63 } 69 }
64 70
65 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE { 71 virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE {
66 return ash::shell::CreateAppListViewDelegate(); 72 return ash::shell::CreateAppListViewDelegate();
67 } 73 }
68 74
69 std::vector<aura::Window*> GetCycleWindowList( 75 std::vector<aura::Window*> GetCycleWindowList(
70 CycleSource source, 76 CycleSource source,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 aura::RootWindow::GetInstance()->Run(); 139 aura::RootWindow::GetInstance()->Run();
134 140
135 ash::Shell::DeleteInstance(); 141 ash::Shell::DeleteInstance();
136 142
137 aura::RootWindow::DeleteInstance(); 143 aura::RootWindow::DeleteInstance();
138 144
139 ui::CompositorTestSupport::Terminate(); 145 ui::CompositorTestSupport::Terminate();
140 146
141 return 0; 147 return 0;
142 } 148 }
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698