diff options
| author | rdevlin.cronin <rdevlin.cronin@chromium.org> | 2015-04-03 13:19:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-03 20:20:20 +0000 |
| commit | 6ae04a013f6040f5d38e6cf04f6da224f21b77f9 (patch) | |
| tree | 427696998b1fd65a9549ab695f30e58f9365c960 /extensions/browser/app_window | |
| parent | 11d52caf494dea19e0feb6184858b9ec24bdb46c (diff) | |
| download | chromium_src-6ae04a013f6040f5d38e6cf04f6da224f21b77f9.zip chromium_src-6ae04a013f6040f5d38e6cf04f6da224f21b77f9.tar.gz chromium_src-6ae04a013f6040f5d38e6cf04f6da224f21b77f9.tar.bz2 | |
Reland: [Extensions] Change ProcessManager to use RenderFrameHosts
(Reland of https://codereview.chromium.org/1037263004)
RenderViewHosts are going to go away, and things using them are blocking
OOPIs. Make ProcessManager use RenderFrameHosts.
Additionally, this takes out ~130 lines of code.
BUG=466373
(TBRing other reviewers from original patch, since no code there changed)
TBR=avi@chromium.org
TBR=asargent@chromium.org
TBR=atwilson@chromium.org
TBR=jamescook@chromium.org
TBR=dgozman@chromium.org
TBR=nick@chromium.org
Review URL: https://codereview.chromium.org/1056463005
Cr-Commit-Position: refs/heads/master@{#323803}
Diffstat (limited to 'extensions/browser/app_window')
| -rw-r--r-- | extensions/browser/app_window/app_window.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc index 0689b13..fc56bae 100644 --- a/extensions/browser/app_window/app_window.cc +++ b/extensions/browser/app_window/app_window.cc @@ -253,6 +253,7 @@ void AppWindow::Init(const GURL& url, app_window_contents_->Initialize(browser_context(), url); content::WebContentsObserver::Observe(web_contents()); + SetViewType(web_contents(), VIEW_TYPE_APP_WINDOW); app_delegate_->InitWebContents(web_contents()); WebContentsModalDialogManager::CreateForWebContents(web_contents()); @@ -260,7 +261,6 @@ void AppWindow::Init(const GURL& url, web_contents()->SetDelegate(this); WebContentsModalDialogManager::FromWebContents(web_contents()) ->SetDelegate(this); - SetViewType(web_contents(), VIEW_TYPE_APP_WINDOW); // Initialize the window CreateParams new_params = LoadDefaults(params); |