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

Side by Side Diff: ash/shell/shell_main.cc

Issue 9297008: [HTerm-Crosh] Add key shortcut for opening Crosh on ChromeOS Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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 <map> 5 #include <map>
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/launcher/launcher_model.h" 8 #include "ash/launcher/launcher_model.h"
9 #include "ash/launcher/launcher_types.h" 9 #include "ash/launcher/launcher_types.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 CycleSource source, 148 CycleSource source,
149 CycleOrder order) const OVERRIDE { 149 CycleOrder order) const OVERRIDE {
150 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer( 150 aura::Window* default_container = ash::Shell::GetInstance()->GetContainer(
151 ash::internal::kShellWindowId_DefaultContainer); 151 ash::internal::kShellWindowId_DefaultContainer);
152 std::vector<aura::Window*> windows = default_container->children(); 152 std::vector<aura::Window*> windows = default_container->children();
153 // Window cycling expects the topmost window at the front of the list. 153 // Window cycling expects the topmost window at the front of the list.
154 std::reverse(windows.begin(), windows.end()); 154 std::reverse(windows.begin(), windows.end());
155 return windows; 155 return windows;
156 } 156 }
157 157
158 virtual void OpenNewTab(NewTabContentType type) OVERRIDE {
159 }
160
158 virtual void LauncherItemClicked( 161 virtual void LauncherItemClicked(
159 const ash::LauncherItem& item) OVERRIDE { 162 const ash::LauncherItem& item) OVERRIDE {
160 aura::Window* window = watcher_->GetWindowByID(item.id); 163 aura::Window* window = watcher_->GetWindowByID(item.id);
161 window->Show(); 164 window->Show();
162 ash::ActivateWindow(window); 165 ash::ActivateWindow(window);
163 } 166 }
164 167
165 virtual int GetBrowserShortcutResourceId() OVERRIDE { 168 virtual int GetBrowserShortcutResourceId() OVERRIDE {
166 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT; 169 return IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
167 } 170 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 window_watcher.reset(); 220 window_watcher.reset();
218 221
219 ash::Shell::DeleteInstance(); 222 ash::Shell::DeleteInstance();
220 223
221 aura::RootWindow::DeleteInstance(); 224 aura::RootWindow::DeleteInstance();
222 225
223 ui::CompositorTestSupport::Terminate(); 226 ui::CompositorTestSupport::Terminate();
224 227
225 return 0; 228 return 0;
226 } 229 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698