Work on separate browser contexts

chrome/browser/ui/browser_commands.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_commands.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ skipping 222 matching lines @@
     if (!download_util::IsSavableURL(
             active_entry ? active_entry->GetURL() : GURL()) ||
         current_tab->ShowingInterstitialPage())
       content_restrictions |= content::CONTENT_RESTRICTION_SAVE;
     if (current_tab->ShowingInterstitialPage())
       content_restrictions |= content::CONTENT_RESTRICTION_PRINT;
   }
   return content_restrictions;
 }
 
-void NewEmptyWindow(Profile* profile) {
+void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
   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());
+    OpenEmptyWindow(profile->GetOffTheRecordProfile(), desktop_type);
   } else {
     content::RecordAction(UserMetricsAction("NewWindow"));
     SessionService* session_service =
         SessionServiceFactory::GetForProfile(profile->GetOriginalProfile());
     if (!session_service ||
         !session_service->RestoreIfNecessary(std::vector<GURL>())) {
-      OpenEmptyWindow(profile->GetOriginalProfile());
+      OpenEmptyWindow(profile->GetOriginalProfile(), desktop_type);
     }
   }
 }
 
-Browser* OpenEmptyWindow(Profile* profile) {
-  Browser* browser = new Browser(Browser::CreateParams(profile));
+void NewEmptyWindow(Profile* profile) {
+  NewEmptyWindow(profile, HOST_DESKTOP_TYPE_NATIVE);
+}
+
+Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) {
+  Browser* browser = new Browser(
+      Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
   AddBlankTab(browser, true);
   browser->window()->Show();
   return browser;
 }
 
+Browser* OpenEmptyWindow(Profile* profile) {
+  return OpenEmptyWindow(profile, HOST_DESKTOP_TYPE_NATIVE);
+}
+
 void OpenWindowWithRestoredTabs(Profile* profile) {
   TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
   if (service)
     service->RestoreMostRecentEntry(NULL);
 }
 
 void OpenURLOffTheRecord(Profile* profile,
                          const GURL& url,
                          chrome::HostDesktopType desktop_type) {
   Browser* browser = browser::FindOrCreateTabbedBrowser(
@@ skipping 772 matching lines @@
         BrowserCommandsTabContentsCreator::CreateTabContents(contents);
   }
   app_browser->tab_strip_model()->AppendTabContents(tab_contents, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
 
 }  // namespace chrome