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

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

Issue 77203002: Revert 236048 "Rename RootWindowHost* to WindowTreeHost*" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
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 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 298
299 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) { 299 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(aura::Window* root) {
300 DCHECK(launcher_delegate_); 300 DCHECK(launcher_delegate_);
301 // Don't show context menu for exclusive app runtime mode. 301 // Don't show context menu for exclusive app runtime mode.
302 if (chrome::IsRunningInAppMode()) 302 if (chrome::IsRunningInAppMode())
303 return NULL; 303 return NULL;
304 304
305 return new LauncherContextMenu(launcher_delegate_, root); 305 return new LauncherContextMenu(launcher_delegate_, root);
306 } 306 }
307 307
308 ash::WindowTreeHostFactory* ChromeShellDelegate::CreateWindowTreeHostFactory() { 308 ash::RootWindowHostFactory* ChromeShellDelegate::CreateRootWindowHostFactory() {
309 return ash::WindowTreeHostFactory::Create(); 309 return ash::RootWindowHostFactory::Create();
310 } 310 }
311 311
312 string16 ChromeShellDelegate::GetProductName() const { 312 string16 ChromeShellDelegate::GetProductName() const {
313 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME); 313 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
314 } 314 }
315 315
316 keyboard::KeyboardControllerProxy* 316 keyboard::KeyboardControllerProxy*
317 ChromeShellDelegate::CreateKeyboardControllerProxy() { 317 ChromeShellDelegate::CreateKeyboardControllerProxy() {
318 return new AshKeyboardControllerProxy(); 318 return new AshKeyboardControllerProxy();
319 } 319 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698