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

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

Issue 1707773002: Revert of Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-15
Patch Set: rebase Created 4 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
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 "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 22 matching lines...) Expand all
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(AppLaunchParams(profile, extension, CURRENT_TAB,
43 chrome::HOST_DESKTOP_TYPE_ASH,
43 extensions::SOURCE_KEYBOARD)); 44 extensions::SOURCE_KEYBOARD));
44 } 45 }
45 46
46 void ChromeNewWindowDelegateChromeos::OpenGetHelp() { 47 void ChromeNewWindowDelegateChromeos::OpenGetHelp() {
47 Profile* const profile = ProfileManager::GetActiveUserProfile(); 48 Profile* const profile = ProfileManager::GetActiveUserProfile();
48 chrome::ShowHelpForProfile(profile, chrome::HELP_SOURCE_KEYBOARD); 49 chrome::ShowHelpForProfile(profile, chrome::HOST_DESKTOP_TYPE_ASH,
50 chrome::HELP_SOURCE_KEYBOARD);
49 } 51 }
50 52
51 void ChromeNewWindowDelegateChromeos::OpenCrosh() { 53 void ChromeNewWindowDelegateChromeos::OpenCrosh() {
52 Profile* profile = ProfileManager::GetActiveUserProfile(); 54 Profile* profile = ProfileManager::GetActiveUserProfile();
53 GURL crosh_url = extensions::TerminalExtensionHelper::GetCroshExtensionURL( 55 GURL crosh_url = extensions::TerminalExtensionHelper::GetCroshExtensionURL(
54 profile); 56 profile);
55 if (!crosh_url.is_valid()) 57 if (!crosh_url.is_valid())
56 return; 58 return;
57 chrome::ScopedTabbedBrowserDisplayer displayer(profile); 59 chrome::ScopedTabbedBrowserDisplayer displayer(profile);
58 Browser* browser = displayer.browser(); 60 Browser* browser = displayer.browser();
59 content::WebContents* page = browser->OpenURL( 61 content::WebContents* page = browser->OpenURL(
60 content::OpenURLParams(crosh_url, 62 content::OpenURLParams(crosh_url,
61 content::Referrer(), 63 content::Referrer(),
62 NEW_FOREGROUND_TAB, 64 NEW_FOREGROUND_TAB,
63 ui::PAGE_TRANSITION_GENERATED, 65 ui::PAGE_TRANSITION_GENERATED,
64 false)); 66 false));
65 browser->window()->Show(); 67 browser->window()->Show();
66 browser->window()->Activate(); 68 browser->window()->Activate();
67 page->Focus(); 69 page->Focus();
68 } 70 }
69 71
70 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() { 72 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() {
71 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222). 73 // TODO(mazda): Move the show logic to ash (http://crbug.com/124222).
72 Profile* profile = ProfileManager::GetActiveUserProfile(); 74 Profile* profile = ProfileManager::GetActiveUserProfile();
73 std::string url(chrome::kChromeUIKeyboardOverlayURL); 75 std::string url(chrome::kChromeUIKeyboardOverlayURL);
74 ash::KeyboardOverlayView::ShowDialog(profile, 76 ash::KeyboardOverlayView::ShowDialog(profile,
75 new ChromeWebContentsHandler, 77 new ChromeWebContentsHandler,
76 GURL(url)); 78 GURL(url));
77 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698