Changes to insure that when in app-mode, links open in the default browser.

chrome/browser/browser.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/idle_timer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/common/pref_names.h"
@@ skipping 145 matching lines @@
     : type_(type),
       profile_(profile),
       window_(NULL),
       tabstrip_model_(this, profile),
       command_updater_(this),
       toolbar_model_(this),
       chrome_updater_factory_(this),
       is_attempting_to_close_browser_(false),
       override_maximized_(false),
       method_factory_(this),
-      idle_task_(new BrowserIdleTimer) {
+      idle_task_(new BrowserIdleTimer),
+      open_new_windows_in_default_browser_(false) {
   tabstrip_model_.AddObserver(this);
 
   NotificationService::current()->AddObserver(
       this, NOTIFY_SSL_STATE_CHANGED, NotificationService::AllSources());
 
   InitCommandState();
   BrowserList::AddBrowser(this);
 
 #if defined(OS_WIN)
   // TODO(port): turn this back on when prefs are fleshed out. This asserts
@@ skipping 925 matching lines @@
     case IDC_NEW_WINDOW:            NewWindow();                   break;
     case IDC_NEW_INCOGNITO_WINDOW:  NewIncognitoWindow();          break;
     case IDC_NEW_WINDOW_PROFILE_0:
     case IDC_NEW_WINDOW_PROFILE_1:
     case IDC_NEW_WINDOW_PROFILE_2:
     case IDC_NEW_WINDOW_PROFILE_3:
     case IDC_NEW_WINDOW_PROFILE_4:
     case IDC_NEW_WINDOW_PROFILE_5:
     case IDC_NEW_WINDOW_PROFILE_6:
     case IDC_NEW_WINDOW_PROFILE_7:
-    case IDC_NEW_WINDOW_PROFILE_8: 
+    case IDC_NEW_WINDOW_PROFILE_8:
         NewProfileWindowByIndex(id - IDC_NEW_WINDOW_PROFILE_0);    break;
     case IDC_CLOSE_WINDOW:          CloseWindow();                 break;
     case IDC_NEW_TAB:               NewTab();                      break;
     case IDC_CLOSE_TAB:             CloseTab();                    break;
     case IDC_SELECT_NEXT_TAB:       SelectNextTab();               break;
     case IDC_SELECT_PREVIOUS_TAB:   SelectPreviousTab();           break;
     case IDC_SELECT_TAB_0:
     case IDC_SELECT_TAB_1:
     case IDC_SELECT_TAB_2:
     case IDC_SELECT_TAB_3:
@@ skipping 519 matching lines @@
 }
 
 void Browser::AddNewContents(TabContents* source,
                              TabContents* new_contents,
                              WindowOpenDisposition disposition,
                              const gfx::Rect& initial_pos,
                              bool user_gesture) {
   DCHECK(disposition != SAVE_TO_DISK);  // No code for this yet
 
   // If this is an application we can only have one tab so we need to process
-  // this in tabbed browser window.
-  if (tabstrip_model_.count() > 0 &&
+  // this in tabbed browser window.  The new window will act as an intermediary
+  // to launch urls in the default browser.
+  if (tabstrip_model_.count() > 0 &&  // A launched application has count of 1.
       disposition != NEW_WINDOW && disposition != NEW_POPUP &&
       type_ != TYPE_NORMAL) {
     Browser* b = GetOrCreateTabbedBrowser();
     DCHECK(b);
+    b->set_open_new_windows_in_default_browser(true);

[Mark Larson, 2009/01/23 07:02:33]

When does this get unset?

     PageTransition::Type transition = PageTransition::LINK;
     // If we were called from an "installed webapp" we want to emulate the code
     // that is run from browser_init.cc for links from external applications.
     // This means we need to open the tab with the START PAGE transition.
     // AddNewContents doesn't support this but the TabStripModel's
     // AddTabContents method does.
     if (type_ == TYPE_APP)
       transition = PageTransition::START_PAGE;
     b->tabstrip_model()->AddTabContents(new_contents, -1, transition, true);
-    b->window()->Show();
+
+    // All new windows from an "installed webapp" which must have their own
+    // tabs will be launched in the default browser.  At this moment the
+    // url is inaccessbile and so we do not show the window until the url is
+    // reported to the TabConentsDelegate.
+    if (type_ != TYPE_APP)
+      b->window()->Show();
     return;
   }
 
   if (disposition == NEW_POPUP) {
     BuildPopupWindow(source, new_contents, initial_pos);
   } else if (disposition == NEW_WINDOW) {
     Browser* browser = Browser::Create(profile_);
     browser->AddNewContents(source, new_contents, NEW_FOREGROUND_TAB,
                             initial_pos, user_gesture);
     browser->window()->Show();
@@ skipping 89 matching lines @@
 }
 
 void Browser::ContentsZoomChange(bool zoom_in) {
   ExecuteCommand(zoom_in ? IDC_ZOOM_PLUS : IDC_ZOOM_MINUS);
 }
 
 bool Browser::IsApplication() const {
   return type_ == TYPE_APP;
 }
 
+bool Browser::ShouldOpenURLInDefaultBrowser() const {
+  return open_new_windows_in_default_browser_;
+}
+
 void Browser::ConvertContentsToApplication(TabContents* contents) {
   WebContents* web_contents = contents->AsWebContents();
   if (!web_contents || !web_contents->web_app()) {
     NOTREACHED();
     return;
   }
 
   int index = tabstrip_model_.GetIndexOfTabContents(contents);
   if (index < 0)
     return;
@@ skipping 626 matching lines @@
   std::wstring window_pref(prefs::kBrowserWindowPlacement);
   window_pref.append(L"_");
   window_pref.append(app_name);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
   prefs->RegisterDictionaryPref(window_pref.c_str());
 }
 
 #endif  // OS_WIN
+