Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: chrome/browser/ui/browser_navigator.cc

Issue 187443008: Elim Browser::AppType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add non trusted type test Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser_navigator.h ('k') | chrome/browser/ui/browser_navigator_browsertest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_navigator.cc
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index 3b6f66eec4b4feef170435281c4b0684beea71e5..845de5d6ea2ea94ebede37a2679dd2ed20e1b2ac 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -164,15 +164,17 @@ Browser* GetBrowserForDisposition(chrome::NavigateParams* params) {
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: {
@@ -398,6 +400,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
target_contents(NULL),
source_contents(NULL),
disposition(CURRENT_TAB),
+ is_trusted(false),
transition(a_transition),
is_renderer_initiated(false),
tabstrip_index(-1),
@@ -420,6 +423,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
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),
@@ -444,6 +448,7 @@ NavigateParams::NavigateParams(Profile* a_profile,
target_contents(NULL),
source_contents(NULL),
disposition(NEW_FOREGROUND_TAB),
+ is_trusted(false),
transition(a_transition),
is_renderer_initiated(false),
tabstrip_index(-1),
@@ -468,6 +473,7 @@ void FillNavigateParamsFromOpenURLParams(chrome::NavigateParams* nav_params,
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;
« no previous file with comments | « chrome/browser/ui/browser_navigator.h ('k') | chrome/browser/ui/browser_navigator_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698