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

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

Issue 8271025: Moved mobile activation into its own modal dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
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 2155 matching lines...) Expand 10 before | Expand all | Expand 10 after
2166 ShowOptionsTab(chrome::kLanguageOptionsSubPage); 2166 ShowOptionsTab(chrome::kLanguageOptionsSubPage);
2167 } 2167 }
2168 2168
2169 void Browser::OpenSystemTabAndActivate() { 2169 void Browser::OpenSystemTabAndActivate() {
2170 OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(), 2170 OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(),
2171 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); 2171 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
2172 window_->Activate(); 2172 window_->Activate();
2173 } 2173 }
2174 2174
2175 void Browser::OpenMobilePlanTabAndActivate() { 2175 void Browser::OpenMobilePlanTabAndActivate() {
2176 OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(), 2176 window_->ShowMobileSetup();
2177 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
2178 window_->Activate();
2179 } 2177 }
2180 #endif 2178 #endif
2181 2179
2182 void Browser::OpenPluginsTabAndActivate() { 2180 void Browser::OpenPluginsTabAndActivate() {
2183 OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(), 2181 OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(),
2184 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK); 2182 NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
2185 window_->Activate(); 2183 window_->Activate();
2186 } 2184 }
2187 2185
2188 /////////////////////////////////////////////////////////////////////////////// 2186 ///////////////////////////////////////////////////////////////////////////////
(...skipping 3100 matching lines...) Expand 10 before | Expand all | Expand 10 after
5289 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type); 5287 window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
5290 } else if (is_type_tabbed()) { 5288 } else if (is_type_tabbed()) {
5291 GlobalErrorService* service = 5289 GlobalErrorService* service =
5292 GlobalErrorServiceFactory::GetForProfile(profile()); 5290 GlobalErrorServiceFactory::GetForProfile(profile());
5293 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView(); 5291 GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
5294 if (error) { 5292 if (error) {
5295 error->ShowBubbleView(this); 5293 error->ShowBubbleView(this);
5296 } 5294 }
5297 } 5295 }
5298 } 5296 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698