chrome/browser/ui/ash/chrome_shell_delegate.cc - Issue 166573005: Rename apps::ShellWindow to apps::AppWindow

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, nits (rename) Created 6 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

« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/app_window.h"

8 #include "apps/shell_window_registry.h"	8 #include "apps/app_window_registry.h"

9 #include "ash/content_support/gpu_support_impl.h"	9 #include "ash/content_support/gpu_support_impl.h"

10 #include "ash/host/window_tree_host_factory.h"	10 #include "ash/host/window_tree_host_factory.h"

11 #include "ash/magnifier/magnifier_constants.h"	11 #include "ash/magnifier/magnifier_constants.h"

12 #include "ash/wm/window_state.h"	12 #include "ash/wm/window_state.h"

13 #include "ash/wm/window_util.h"	13 #include "ash/wm/window_util.h"

14 #include "base/command_line.h"	14 #include "base/command_line.h"

15 #include "chrome/browser/app_mode/app_mode_utils.h"	15 #include "chrome/browser/app_mode/app_mode_utils.h"

16 #include "chrome/browser/lifetime/application_lifetime.h"	16 #include "chrome/browser/lifetime/application_lifetime.h"

17 #include "chrome/browser/profiles/profile_manager.h"	17 #include "chrome/browser/profiles/profile_manager.h"

18 #include "chrome/browser/ui/app_list/app_list_service.h"	18 #include "chrome/browser/ui/app_list/app_list_service.h"

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 }	154 }

155	155

156 base::string16 ChromeShellDelegate::GetProductName() const {	156 base::string16 ChromeShellDelegate::GetProductName() const {

157 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);	157 return l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);

158 }	158 }

159	159

160 keyboard::KeyboardControllerProxy*	160 keyboard::KeyboardControllerProxy*

161 ChromeShellDelegate::CreateKeyboardControllerProxy() {	161 ChromeShellDelegate::CreateKeyboardControllerProxy() {

162 return new AshKeyboardControllerProxy();	162 return new AshKeyboardControllerProxy();

163 }	163 }

OLD	NEW