| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 2201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2212 ShowOptionsTab(chrome::kLanguageOptionsSubPage); | 2212 ShowOptionsTab(chrome::kLanguageOptionsSubPage); |
| 2213 } | 2213 } |
| 2214 | 2214 |
| 2215 void Browser::OpenSystemTabAndActivate() { | 2215 void Browser::OpenSystemTabAndActivate() { |
| 2216 OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(), | 2216 OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(), |
| 2217 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); | 2217 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); |
| 2218 window_->Activate(); | 2218 window_->Activate(); |
| 2219 } | 2219 } |
| 2220 | 2220 |
| 2221 void Browser::OpenMobilePlanTabAndActivate() { | 2221 void Browser::OpenMobilePlanTabAndActivate() { |
| 2222 OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(), | 2222 window_->ShowMobileSetup(); |
| 2223 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); | |
| 2224 window_->Activate(); | |
| 2225 } | 2223 } |
| 2226 #endif | 2224 #endif |
| 2227 | 2225 |
| 2228 void Browser::OpenPluginsTabAndActivate() { | 2226 void Browser::OpenPluginsTabAndActivate() { |
| 2229 OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(), | 2227 OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(), |
| 2230 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); | 2228 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); |
| 2231 window_->Activate(); | 2229 window_->Activate(); |
| 2232 } | 2230 } |
| 2233 | 2231 |
| 2234 /////////////////////////////////////////////////////////////////////////////// | 2232 /////////////////////////////////////////////////////////////////////////////// |
| (...skipping 3248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5483 } | 5481 } |
| 5484 | 5482 |
| 5485 void Browser::UpdateFullscreenExitBubbleContent() { | 5483 void Browser::UpdateFullscreenExitBubbleContent() { |
| 5486 GURL url; | 5484 GURL url; |
| 5487 if (fullscreened_tab_) | 5485 if (fullscreened_tab_) |
| 5488 url = fullscreened_tab_->tab_contents()->GetURL(); | 5486 url = fullscreened_tab_->tab_contents()->GetURL(); |
| 5489 | 5487 |
| 5490 window_->UpdateFullscreenExitBubbleContent( | 5488 window_->UpdateFullscreenExitBubbleContent( |
| 5491 url, GetFullscreenExitBubbleType()); | 5489 url, GetFullscreenExitBubbleType()); |
| 5492 } | 5490 } |
| OLD | NEW |