chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.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_new_window_delegate_chromeos.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/accelerator_commands_browsertest.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_new_window_delegate_chromeos.h"	5 #include "chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h"

6	6

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

8 #include "apps/ui/native_app_window.h"	8 #include "apps/ui/native_app_window.h"

9 #include "ash/keyboard_overlay/keyboard_overlay_view.h"	9 #include "ash/keyboard_overlay/keyboard_overlay_view.h"

10 #include "chrome/browser/chromeos/file_manager/app_id.h"	10 #include "chrome/browser/chromeos/file_manager/app_id.h"

11 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"	11 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h"

12 #include "chrome/browser/extensions/extension_service.h"	12 #include "chrome/browser/extensions/extension_service.h"

13 #include "chrome/browser/extensions/extension_util.h"	13 #include "chrome/browser/extensions/extension_util.h"

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

15 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

16 #include "chrome/browser/ui/browser_window.h"	16 #include "chrome/browser/ui/browser_window.h"

17 #include "chrome/browser/ui/extensions/application_launch.h"	17 #include "chrome/browser/ui/extensions/application_launch.h"

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 }	68 }

69	69

70 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() {	70 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() {

71 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222).	71 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222).

72 Profile* profile = ProfileManager::GetActiveUserProfile();	72 Profile* profile = ProfileManager::GetActiveUserProfile();

73 std::string url(chrome::kChromeUIKeyboardOverlayURL);	73 std::string url(chrome::kChromeUIKeyboardOverlayURL);

74 ash::KeyboardOverlayView::ShowDialog(profile,	74 ash::KeyboardOverlayView::ShowDialog(profile,

75 new ChromeWebContentsHandler,	75 new ChromeWebContentsHandler,

76 GURL(url));	76 GURL(url));

77 }	77 }

OLD	NEW