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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 chrome::ShowHelpForProfile( | 49 chrome::ShowHelpForProfile( |
50 profile, chrome::HOST_DESKTOP_TYPE_ASH, chrome::HELP_SOURCE_KEYBOARD); | 50 profile, chrome::HOST_DESKTOP_TYPE_ASH, chrome::HELP_SOURCE_KEYBOARD); |
51 } | 51 } |
52 | 52 |
53 void ChromeNewWindowDelegateChromeos::OpenCrosh() { | 53 void ChromeNewWindowDelegateChromeos::OpenCrosh() { |
54 Profile* profile = ProfileManager::GetActiveUserProfile(); | 54 Profile* profile = ProfileManager::GetActiveUserProfile(); |
55 GURL crosh_url = extensions::TerminalExtensionHelper::GetCroshExtensionURL( | 55 GURL crosh_url = extensions::TerminalExtensionHelper::GetCroshExtensionURL( |
56 profile); | 56 profile); |
57 if (!crosh_url.is_valid()) | 57 if (!crosh_url.is_valid()) |
58 return; | 58 return; |
59 chrome::ScopedTabbedBrowserDisplayer displayer( | 59 chrome::ScopedTabbedBrowserDisplayer displayer(profile); |
60 profile, | |
61 chrome::HOST_DESKTOP_TYPE_ASH); | |
62 Browser* browser = displayer.browser(); | 60 Browser* browser = displayer.browser(); |
63 content::WebContents* page = browser->OpenURL( | 61 content::WebContents* page = browser->OpenURL( |
64 content::OpenURLParams(crosh_url, | 62 content::OpenURLParams(crosh_url, |
65 content::Referrer(), | 63 content::Referrer(), |
66 NEW_FOREGROUND_TAB, | 64 NEW_FOREGROUND_TAB, |
67 ui::PAGE_TRANSITION_GENERATED, | 65 ui::PAGE_TRANSITION_GENERATED, |
68 false)); | 66 false)); |
69 browser->window()->Show(); | 67 browser->window()->Show(); |
70 browser->window()->Activate(); | 68 browser->window()->Activate(); |
71 page->Focus(); | 69 page->Focus(); |
72 } | 70 } |
73 | 71 |
74 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() { | 72 void ChromeNewWindowDelegateChromeos::ShowKeyboardOverlay() { |
75 // 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). |
76 Profile* profile = ProfileManager::GetActiveUserProfile(); | 74 Profile* profile = ProfileManager::GetActiveUserProfile(); |
77 std::string url(chrome::kChromeUIKeyboardOverlayURL); | 75 std::string url(chrome::kChromeUIKeyboardOverlayURL); |
78 ash::KeyboardOverlayView::ShowDialog(profile, | 76 ash::KeyboardOverlayView::ShowDialog(profile, |
79 new ChromeWebContentsHandler, | 77 new ChromeWebContentsHandler, |
80 GURL(url)); | 78 GURL(url)); |
81 } | 79 } |
OLD | NEW |