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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 1 month 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 | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/event_rewriter.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 "chrome/browser/ui/ash/chrome_shell_delegate.h" 5 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
6 6
7 #include "apps/shell_window.h" 7 #include "apps/shell_window.h"
8 #include "apps/shell_window_registry.h" 8 #include "apps/shell_window_registry.h"
9 #include "ash/host/root_window_host_factory.h" 9 #include "ash/host/root_window_host_factory.h"
10 #include "ash/magnifier/magnifier_constants.h" 10 #include "ash/magnifier/magnifier_constants.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 content::RecordAction( 299 content::RecordAction(
300 content::UserMetricsAction("WindowSelector_Overview")); 300 content::UserMetricsAction("WindowSelector_Overview"));
301 break; 301 break;
302 case ash::UMA_WINDOW_SELECTION: 302 case ash::UMA_WINDOW_SELECTION:
303 content::RecordAction( 303 content::RecordAction(
304 content::UserMetricsAction("WindowSelector_Selection")); 304 content::UserMetricsAction("WindowSelector_Selection"));
305 break; 305 break;
306 } 306 }
307 } 307 }
308 308
309 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::RootWindow* root) { 309 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) {
310 DCHECK(launcher_delegate_); 310 DCHECK(launcher_delegate_);
311 // Don't show context menu for exclusive app runtime mode. 311 // Don't show context menu for exclusive app runtime mode.
312 if (chrome::IsRunningInAppMode()) 312 if (chrome::IsRunningInAppMode())
313 return NULL; 313 return NULL;
314 314
315 return new LauncherContextMenu(launcher_delegate_, root); 315 return new LauncherContextMenu(launcher_delegate_, root);
316 } 316 }
317 317
318 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() { 318 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() {
319 return ash::RootWindowHostFactory::Create(); 319 return ash::RootWindowHostFactory::Create();
320 } 320 }
321 321
322 string16 ChromeShellDelegate::GetProductName() const { 322 string16 ChromeShellDelegate::GetProductName() const {
323 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); 323 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
324 } 324 }
325 325
326 keyboard::KeyboardControllerProxy* 326 keyboard::KeyboardControllerProxy*
327 ChromeShellDelegate::CreateKeyboardControllerProxy() { 327 ChromeShellDelegate::CreateKeyboardControllerProxy() {
328 return new AshKeyboardControllerProxy(); 328 return new AshKeyboardControllerProxy();
329 } 329 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698