Elim Browser::AppType

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/prefs/pref_service.h"
@@ skipping 146 matching lines @@
       } else if (params->browser && !params->browser->app_name().empty()) {
         app_name = params->browser->app_name();
       } else if (params->source_contents) {
         extensions::TabHelper* extensions_tab_helper =
             extensions::TabHelper::FromWebContents(params->source_contents);
         if (extensions_tab_helper && extensions_tab_helper->is_app()) {
           app_name = web_app::GenerateApplicationNameFromExtensionId(
               extensions_tab_helper->extension_app()->id());
         }
       }
+      Browser::Type type = params->is_trusted ? Browser::TYPE_TRUSTED_POPUP
+                                              : Browser::TYPE_POPUP;
       if (app_name.empty()) {
         Browser::CreateParams browser_params(
-            Browser::TYPE_POPUP, profile, params->host_desktop_type);
+            type, profile, params->host_desktop_type);
         browser_params.initial_bounds = params->window_bounds;
         return new Browser(browser_params);
       }
 
       return new Browser(Browser::CreateParams::CreateForApp(
-          Browser::TYPE_POPUP, app_name, params->window_bounds, profile,
+          type, app_name, params->window_bounds, profile,
           params->host_desktop_type));
     }
     case NEW_WINDOW: {
       // Make a new normal browser window.
       return new Browser(Browser::CreateParams(profile,
                                                params->host_desktop_type));
     }
     case OFF_THE_RECORD:
       // Make or find an incognito window.
       return GetOrCreateBrowser(profile->GetOffTheRecordProfile(),
@@ skipping 205 matching lines @@
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                const GURL& a_url,
                                content::PageTransition a_transition)
     : url(a_url),
       frame_tree_node_id(-1),
       uses_post(false),
       target_contents(NULL),
       source_contents(NULL),
       disposition(CURRENT_TAB),
+      is_trusted(false),
       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),
       initiating_profile(NULL),
       host_desktop_type(GetHostDesktop(a_browser)),
       should_replace_current_entry(false),
       should_set_opener(false) {
 }
 
 NavigateParams::NavigateParams(Browser* a_browser,
                                WebContents* a_target_contents)
     : frame_tree_node_id(-1),
       uses_post(false),
       target_contents(a_target_contents),
       source_contents(NULL),
       disposition(CURRENT_TAB),
+      is_trusted(false),
       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),
       initiating_profile(NULL),
       host_desktop_type(GetHostDesktop(a_browser)),
       should_replace_current_entry(false),
       should_set_opener(false) {
 }
 
 NavigateParams::NavigateParams(Profile* a_profile,
                                const GURL& a_url,
                                content::PageTransition a_transition)
     : url(a_url),
       frame_tree_node_id(-1),
       uses_post(false),
       target_contents(NULL),
       source_contents(NULL),
       disposition(NEW_FOREGROUND_TAB),
+      is_trusted(false),
       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),
       host_desktop_type(chrome::GetActiveDesktop()),
       should_replace_current_entry(false),
       should_set_opener(false) {
 }
 
 NavigateParams::~NavigateParams() {}
 
 void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
                                          const content::OpenURLParams& params) {
   nav_params->referrer = params.referrer;
   nav_params->frame_tree_node_id = params.frame_tree_node_id;
   nav_params->redirect_chain = params.redirect_chain;
   nav_params->extra_headers = params.extra_headers;
   nav_params->disposition = params.disposition;
+  nav_params->is_trusted = false;
   nav_params->is_renderer_initiated = params.is_renderer_initiated;
   nav_params->transferred_global_request_id =
       params.transferred_global_request_id;
   nav_params->should_replace_current_entry =
       params.should_replace_current_entry;
   nav_params->uses_post = params.uses_post;
   nav_params->browser_initiated_post_data = params.browser_initiated_post_data;
 }
 
 void Navigate(NavigateParams* params) {
@@ skipping 274 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == content::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome