OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/views/ash/chrome_shell_delegate.h" | 5 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" |
6 | 6 |
7 #include "ash/launcher/launcher_types.h" | 7 #include "ash/launcher/launcher_types.h" |
8 #include "ash/system/tray/system_tray_delegate.h" | 8 #include "ash/system/tray/system_tray_delegate.h" |
9 #include "ash/wm/partial_screenshot_view.h" | 9 #include "ash/wm/partial_screenshot_view.h" |
10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 content::OpenURLParams(crosh_url, | 193 content::OpenURLParams(crosh_url, |
194 content::Referrer(), | 194 content::Referrer(), |
195 NEW_FOREGROUND_TAB, | 195 NEW_FOREGROUND_TAB, |
196 content::PAGE_TRANSITION_GENERATED, | 196 content::PAGE_TRANSITION_GENERATED, |
197 false)); | 197 false)); |
198 #endif | 198 #endif |
199 } | 199 } |
200 | 200 |
201 void ChromeShellDelegate::OpenMobileSetup(const std::string& service_path) { | 201 void ChromeShellDelegate::OpenMobileSetup(const std::string& service_path) { |
202 #if defined(OS_CHROMEOS) | 202 #if defined(OS_CHROMEOS) |
203 Browser* browser = GetTargetBrowser(); | 203 MobileSetupDialog::Show(service_path); |
204 if (CommandLine::ForCurrentProcess()->HasSwitch( | |
205 switches::kEnableMobileSetupDialog)) { | |
206 MobileSetupDialog::Show(service_path); | |
207 } else { | |
208 std::string url(chrome::kChromeUIMobileSetupURL); | |
209 url.append(service_path); | |
210 browser->OpenURL( | |
211 content::OpenURLParams(GURL(url), | |
212 content::Referrer(), | |
213 NEW_FOREGROUND_TAB, | |
214 content::PAGE_TRANSITION_LINK, | |
215 false)); | |
216 browser->window()->Activate(); | |
217 } | |
218 #endif | 204 #endif |
219 } | 205 } |
220 | 206 |
221 void ChromeShellDelegate::RestoreTab() { | 207 void ChromeShellDelegate::RestoreTab() { |
222 Browser* browser = GetTargetBrowser(); | 208 Browser* browser = GetTargetBrowser(); |
223 // Do not restore tabs while in the incognito mode. | 209 // Do not restore tabs while in the incognito mode. |
224 if (browser->profile()->IsOffTheRecord()) | 210 if (browser->profile()->IsOffTheRecord()) |
225 return; | 211 return; |
226 TabRestoreService* service = | 212 TabRestoreService* service = |
227 TabRestoreServiceFactory::GetForProfile(browser->profile()); | 213 TabRestoreServiceFactory::GetForProfile(browser->profile()); |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
378 ash::Shell::GetInstance()->ShowLauncher(); | 364 ash::Shell::GetInstance()->ShowLauncher(); |
379 break; | 365 break; |
380 default: | 366 default: |
381 NOTREACHED() << "Unexpected notification " << type; | 367 NOTREACHED() << "Unexpected notification " << type; |
382 } | 368 } |
383 #else | 369 #else |
384 // MSVC++ warns about switch statements without any cases. | 370 // MSVC++ warns about switch statements without any cases. |
385 NOTREACHED() << "Unexpected notification " << type; | 371 NOTREACHED() << "Unexpected notification " << type; |
386 #endif | 372 #endif |
387 } | 373 } |
OLD | NEW |