Reland r126700: ash uber tray: Add the detailed network popup

chrome/browser/ui/browser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 623 matching lines @@
 }
 
 bool Browser::is_devtools() const {
   return app_name_ == DevToolsWindow::kDevToolsApp;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Creation Helpers:
 
 // static
-void Browser::NewEmptyWindow(Profile* profile) {
+Browser* Browser::NewEmptyWindow(Profile* profile) {
   bool incognito = profile->IsOffTheRecord();
   PrefService* prefs = profile->GetPrefs();
   if (incognito) {
     if (IncognitoModePrefs::GetAvailability(prefs) ==
           IncognitoModePrefs::DISABLED) {
       incognito = false;
     }
   } else {
     if (browser_defaults::kAlwaysOpenIncognitoWindow &&
         IncognitoModePrefs::ShouldLaunchIncognito(
             *CommandLine::ForCurrentProcess(), prefs)) {
       incognito = true;
     }
   }
 
   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
 void Browser::OpenWindowWithRestoredTabs(Profile* profile) {
   TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
   if (service)
     service->RestoreMostRecentEntry(NULL);
 }
 
 // static
@@ skipping 4931 matching lines @@
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI();
   }
 #endif
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }