Convert banned calls to use Navigate in ash app list.

chrome/browser/ui/browser_navigator.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_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
@@ skipping 56 matching lines @@
 // technically an incognito window, these URLs are allowed.
 // Returns true on success. Otherwise, if changing params leads the browser into
 // an erroneous state, returns false.
 bool AdjustNavigateParamsForURL(chrome::NavigateParams* params) {
   if (params->target_contents != NULL ||
       chrome::IsURLAllowedInIncognito(params->url) ||
       Profile::IsGuestSession()) {
     return true;
   }
 
-  Profile* profile = params->browser->profile();
+  Profile* profile = params->initiating_profile;
 
   if (profile->IsOffTheRecord() || params->disposition == OFF_THE_RECORD) {
     profile = profile->GetOriginalProfile();
 
     // If incognito is forced, we punt.
     PrefService* prefs = profile->GetPrefs();
     if (prefs && IncognitoModePrefs::GetAvailability(prefs) ==
             IncognitoModePrefs::FORCED) {
       return false;
     }
 
     params->disposition = SINGLETON_TAB;
     params->browser = browser::FindOrCreateTabbedBrowser(profile);
     params->window_action = chrome::NavigateParams::SHOW_WINDOW;
   }
 
   return true;
 }
 
 // Returns a Browser that can host the navigation or tab addition specified in
 // |params|. This might just return the same Browser specified in |params|, or
 // some other if that Browser is deemed incompatible.
 Browser* GetBrowserForDisposition(chrome::NavigateParams* params) {
   // If no source TabContents was specified, we use the selected one from
   // the target browser. This must happen first, before
   // GetBrowserForDisposition() has a chance to replace |params->browser| with
   // another one.
-  if (!params->source_contents)
+  if (!params->source_contents && params->browser)
     params->source_contents = chrome::GetActiveTabContents(params->browser);
 
-  Profile* profile = params->browser->profile();
+  Profile* profile = params->initiating_profile;
 
   switch (params->disposition) {
     case CURRENT_TAB:
-      return params->browser;
+      if (params->browser)
+        return params->browser;
+      // Find a compatible window and re-execute this command in it. Otherwise
+      // re-run with NEW_WINDOW.
+      return GetOrCreateBrowser(profile);
     case SINGLETON_TAB:
     case NEW_FOREGROUND_TAB:
     case NEW_BACKGROUND_TAB:
       // See if we can open the tab in the window this navigator is bound to.
-      if (WindowCanOpenTabs(params->browser))
+      if (params->browser && WindowCanOpenTabs(params->browser))
         return params->browser;
       // Find a compatible window and re-execute this command in it. Otherwise
       // re-run with NEW_WINDOW.
       return GetOrCreateBrowser(profile);
     case NEW_POPUP: {
       // Make a new popup window.
       // Coerce app-style if |source| represents an app.
       std::string app_name;
       if (!params->extension_app_id.empty()) {
         app_name = web_app::GenerateApplicationNameFromExtensionId(
@@ skipping 69 matching lines @@
     case SINGLETON_TAB:
       params->tabstrip_add_types |= TabStripModel::ADD_ACTIVE;
       break;
 
     default:
       break;
   }
 }
 
 // Obtain the profile used by the code that originated the Navigate() request.
-// |source_browser| represents the Browser that was supplied in |params| before
-// it was modified.
-Profile* GetSourceProfile(chrome::NavigateParams* params,
-                          Browser* source_browser) {
+Profile* GetSourceProfile(chrome::NavigateParams* params) {
   if (params->source_contents)
     return params->source_contents->profile();
 
-  return source_browser->profile();
+  return params->initiating_profile;
 }
 
 void LoadURLInContents(WebContents* target_contents,
                        const GURL& url,
                        chrome::NavigateParams* params,
                        const std::string& extra_headers) {
   content::NavigationController::LoadURLParams load_url_params(url);
   load_url_params.referrer = params->referrer;
   load_url_params.transition_type = params->transition;
   load_url_params.extra_headers = extra_headers;
@@ skipping 112 matching lines @@
       source_contents(NULL),
       disposition(CURRENT_TAB),
       transition(a_transition),
       is_renderer_initiated(false),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_ACTIVE),
       window_action(NO_ACTION),
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
-      browser(a_browser) {
-}
+      browser(a_browser),
+      initiating_profile(NULL) {}
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                TabContents* a_target_contents)
     : target_contents(a_target_contents),
       source_contents(NULL),
       disposition(CURRENT_TAB),
       transition(content::PAGE_TRANSITION_LINK),
       is_renderer_initiated(false),
       tabstrip_index(-1),
       tabstrip_add_types(TabStripModel::ADD_ACTIVE),
       window_action(NO_ACTION),
       user_gesture(true),
       path_behavior(RESPECT),
       ref_behavior(IGNORE_REF),
-      browser(a_browser) {
-}
+      browser(a_browser),
+      initiating_profile(NULL) {}
 
-NavigateParams::~NavigateParams() {
-}
+NavigateParams::NavigateParams(Profile* a_profile,
+                               const GURL& a_url,
+                               content::PageTransition a_transition)
+    : url(a_url),
+      target_contents(NULL),
+      source_contents(NULL),
+      disposition(NEW_FOREGROUND_TAB),
+      transition(a_transition),
+      is_renderer_initiated(false),
+      tabstrip_index(-1),
+      tabstrip_add_types(TabStripModel::ADD_ACTIVE),
+      window_action(SHOW_WINDOW),
+      user_gesture(true),
+      path_behavior(RESPECT),
+      ref_behavior(IGNORE_REF),
+      browser(NULL),
+      initiating_profile(a_profile) {}
+
+NavigateParams::~NavigateParams() {}
 
 void Navigate(NavigateParams* params) {
   Browser* source_browser = params->browser;
+  if (source_browser)
+    params->initiating_profile = source_browser->profile();
+  DCHECK(params->initiating_profile);
 
   if (!AdjustNavigateParamsForURL(params))
     return;
 
   // The browser window may want to adjust the disposition.
-  if (params->disposition == NEW_POPUP && source_browser->window()) {
+  if (params->disposition == NEW_POPUP &&
+      source_browser &&
+      source_browser->window()) {
     params->disposition =
         source_browser->window()->GetDispositionForPopupBounds(
             params->window_bounds);
   }
 
   // Adjust disposition for the navigation happending in the sad page of the
   // panel window.
   if (params->source_contents &&
       params->source_contents->web_contents()->IsCrashed() &&
       params->disposition == CURRENT_TAB &&
+      params->browser &&
       params->browser->is_type_panel()) {
     params->disposition = NEW_FOREGROUND_TAB;
   }
 
   params->browser = GetBrowserForDisposition(params);
 
   if (!params->browser)
     return;
 
   // Navigate() must not return early after this point.
 
-  if (GetSourceProfile(params, source_browser) != params->browser->profile()) {
+  if (GetSourceProfile(params) != params->browser->profile()) {
     // A tab is being opened from a link from a different profile, we must reset
     // source information that may cause state to be shared.
     params->source_contents = NULL;
     params->referrer = content::Referrer();
   }
 
   // Make sure the Browser is shown if params call for it.
   ScopedBrowserDisplayer displayer(params);
 
   // Makes sure any TabContents created by this function is destroyed if
@@ skipping 168 matching lines @@
   return !(url.scheme() == chrome::kChromeUIScheme &&
       (url.host() == chrome::kChromeUISettingsHost ||
        url.host() == chrome::kChromeUISettingsFrameHost ||
        url.host() == chrome::kChromeUIExtensionsHost ||
        url.host() == chrome::kChromeUIBookmarksHost ||
        url.host() == chrome::kChromeUISyncPromoHost ||
        url.host() == chrome::kChromeUIUberHost));
 }
 
 }  // namespace chrome