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

Unified Diff: chrome/browser/ui/browser.cc

Issue 9664056: ash uber tray: Add the detailed network popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 53b38b7a357e3033e5fa13df16f169dc8942ef00..1800b7c81bb47cc788db31010abd6d989b25341c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -641,7 +641,7 @@ bool Browser::is_devtools() const {
// Browser, Creation Helpers:
// static
-void Browser::NewEmptyWindow(Profile* profile) {
+Browser* Browser::NewEmptyWindow(Profile* profile) {
bool incognito = profile->IsOffTheRecord();
PrefService* prefs = profile->GetPrefs();
if (incognito) {
@@ -659,23 +659,25 @@ void Browser::NewEmptyWindow(Profile* profile) {
if (incognito) {
content::RecordAction(UserMetricsAction("NewIncognitoWindow"));
- OpenEmptyWindow(profile->GetOffTheRecordProfile());
+ return OpenEmptyWindow(profile->GetOffTheRecordProfile());
} else {
content::RecordAction(UserMetricsAction("NewWindow"));
SessionService* session_service =
SessionServiceFactory::GetForProfile(profile->GetOriginalProfile());
if (!session_service ||
!session_service->RestoreIfNecessary(std::vector<GURL>())) {
- OpenEmptyWindow(profile->GetOriginalProfile());
+ return OpenEmptyWindow(profile->GetOriginalProfile());
}
}
+ return NULL;
}
// static
-void Browser::OpenEmptyWindow(Profile* profile) {
+Browser* Browser::OpenEmptyWindow(Profile* profile) {
Browser* browser = Browser::Create(profile);
browser->AddBlankTab(true);
browser->window()->Show();
+ return browser;
}
// static

Powered by Google App Engine
This is Rietveld 408576698