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

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

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re^3base 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
OLDNEW
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/shell_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_system.h"
14 #include "chrome/browser/extensions/extension_util.h" 13 #include "chrome/browser/extensions/extension_util.h"
15 #include "chrome/browser/profiles/profile_manager.h" 14 #include "chrome/browser/profiles/profile_manager.h"
16 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_window.h" 16 #include "chrome/browser/ui/browser_window.h"
18 #include "chrome/browser/ui/extensions/application_launch.h" 17 #include "chrome/browser/ui/extensions/application_launch.h"
19 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 18 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
20 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" 19 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
21 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
22 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
23 #include "content/public/browser/web_contents_view.h" 22 #include "content/public/browser/web_contents_view.h"
23 #include "extensions/browser/extension_system.h"
24 24
25 ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {} 25 ChromeNewWindowDelegateChromeos::ChromeNewWindowDelegateChromeos() {}
26 ChromeNewWindowDelegateChromeos::~ChromeNewWindowDelegateChromeos() {} 26 ChromeNewWindowDelegateChromeos::~ChromeNewWindowDelegateChromeos() {}
27 27
28 void ChromeNewWindowDelegateChromeos::OpenFileManager() { 28 void ChromeNewWindowDelegateChromeos::OpenFileManager() {
29 using file_manager::kFileManagerAppId; 29 using file_manager::kFileManagerAppId;
30 Profile* const profile = ProfileManager::GetActiveUserProfile(); 30 Profile* const profile = ProfileManager::GetActiveUserProfile();
31 const ExtensionService* const service = 31 const ExtensionService* const service =
32 extensions::ExtensionSystem::Get(profile)->extension_service(); 32 extensions::ExtensionSystem::Get(profile)->extension_service();
33 if (!service || 33 if (!service ||
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698