chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc - Issue 494033002: Move AppWindow to extensions

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

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 3 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/app_window_registry.h"

8 #include "ash/keyboard_overlay/keyboard_overlay_view.h"	7 #include "ash/keyboard_overlay/keyboard_overlay_view.h"

9 #include "chrome/browser/chromeos/file_manager/app_id.h"	8 #include "chrome/browser/chromeos/file_manager/app_id.h"

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

11 #include "chrome/browser/extensions/extension_service.h"	10 #include "chrome/browser/extensions/extension_service.h"

12 #include "chrome/browser/extensions/extension_util.h"	11 #include "chrome/browser/extensions/extension_util.h"

13 #include "chrome/browser/profiles/profile_manager.h"	12 #include "chrome/browser/profiles/profile_manager.h"

14 #include "chrome/browser/ui/browser.h"	13 #include "chrome/browser/ui/browser.h"

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

16 #include "chrome/browser/ui/extensions/application_launch.h"	15 #include "chrome/browser/ui/extensions/application_launch.h"

17 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"	16 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

18 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"	17 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"

19 #include "chrome/common/url_constants.h"	18 #include "chrome/common/url_constants.h"

20 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

21 #include "extensions/browser/app_window/native_app_window.h"

22 #include "extensions/browser/extension_system.h"	20 #include "extensions/browser/extension_system.h"

23	21

24 ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {}	22 ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {}

25 ChromeNewWindowDelegateChromeos::~ChromeNewWindowDelegateChromeos() {}	23 ChromeNewWindowDelegateChromeos::~ChromeNewWindowDelegateChromeos() {}

26	24

27 void ChromeNewWindowDelegateChromeos::OpenFileManager() {	25 void ChromeNewWindowDelegateChromeos::OpenFileManager() {

28 using file_manager::kFileManagerAppId;	26 using file_manager::kFileManagerAppId;

29 Profile* const profile = ProfileManager::GetActiveUserProfile();	27 Profile* const profile = ProfileManager::GetActiveUserProfile();

30 const ExtensionService* const service =	28 const ExtensionService* const service =

31 extensions::ExtensionSystem::Get(profile)->extension_service();	29 extensions::ExtensionSystem::Get(profile)->extension_service();

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 }	65 }

68	66

69 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() {	67 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() {

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

71 Profile* profile = ProfileManager::GetActiveUserProfile();	69 Profile* profile = ProfileManager::GetActiveUserProfile();

72 std::string url(chrome::kChromeUIKeyboardOverlayURL);	70 std::string url(chrome::kChromeUIKeyboardOverlayURL);

73 ash::KeyboardOverlayView::ShowDialog(profile,	71 ash::KeyboardOverlayView::ShowDialog(profile,

74 new ChromeWebContentsHandler,	72 new ChromeWebContentsHandler,

75 GURL(url));	73 GURL(url));

76 }	74 }

OLD	NEW