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 "ash/content/keyboard_overlay/keyboard_overlay_view.h" | 7 #include "ash/content/keyboard_overlay/keyboard_overlay_view.h" |
8 #include "chrome/browser/chromeos/file_manager/app_id.h" | 8 #include "chrome/browser/chromeos/file_manager/app_id.h" |
9 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" | 9 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 const ExtensionService* const service = | 32 const ExtensionService* const service = |
33 extensions::ExtensionSystem::Get(profile)->extension_service(); | 33 extensions::ExtensionSystem::Get(profile)->extension_service(); |
34 if (!service || | 34 if (!service || |
35 !extensions::util::IsAppLaunchableWithoutEnabling(kFileManagerAppId, | 35 !extensions::util::IsAppLaunchableWithoutEnabling(kFileManagerAppId, |
36 profile)) { | 36 profile)) { |
37 return; | 37 return; |
38 } | 38 } |
39 | 39 |
40 const extensions::Extension* const extension = | 40 const extensions::Extension* const extension = |
41 service->GetInstalledExtension(kFileManagerAppId); | 41 service->GetInstalledExtension(kFileManagerAppId); |
42 OpenApplication(AppLaunchParams(profile, extension, CURRENT_TAB, | 42 OpenApplication(CreateAppLaunchParamsUserContainer( |
43 chrome::HOST_DESKTOP_TYPE_ASH, | 43 profile, extension, NEW_FOREGROUND_TAB, extensions::SOURCE_KEYBOARD)); |
44 extensions::SOURCE_KEYBOARD)); | |
45 } | 44 } |
46 | 45 |
47 void ChromeNewWindowDelegateChromeos::OpenGetHelp() { | 46 void ChromeNewWindowDelegateChromeos::OpenGetHelp() { |
48 Profile* const profile = ProfileManager::GetActiveUserProfile(); | 47 Profile* const profile = ProfileManager::GetActiveUserProfile(); |
49 chrome::ShowHelpForProfile(profile, chrome::HOST_DESKTOP_TYPE_ASH, | 48 chrome::ShowHelpForProfile(profile, chrome::HOST_DESKTOP_TYPE_ASH, |
50 chrome::HELP_SOURCE_KEYBOARD); | 49 chrome::HELP_SOURCE_KEYBOARD); |
51 } | 50 } |
52 | 51 |
53 void ChromeNewWindowDelegateChromeos::OpenCrosh() { | 52 void ChromeNewWindowDelegateChromeos::OpenCrosh() { |
54 Profile* profile = ProfileManager::GetActiveUserProfile(); | 53 Profile* profile = ProfileManager::GetActiveUserProfile(); |
(...skipping 15 matching lines...) Expand all Loading... |
70 } | 69 } |
71 | 70 |
72 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() { | 71 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() { |
73 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222). | 72 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222). |
74 Profile* profile = ProfileManager::GetActiveUserProfile(); | 73 Profile* profile = ProfileManager::GetActiveUserProfile(); |
75 std::string url(chrome::kChromeUIKeyboardOverlayURL); | 74 std::string url(chrome::kChromeUIKeyboardOverlayURL); |
76 ash::KeyboardOverlayView::ShowDialog(profile, | 75 ash::KeyboardOverlayView::ShowDialog(profile, |
77 new ChromeWebContentsHandler, | 76 new ChromeWebContentsHandler, |
78 GURL(url)); | 77 GURL(url)); |
79 } | 78 } |
OLD | NEW |