summaryrefslogtreecommitdiffstats
path: root/extensions/browser/app_window
diff options
context:
space:
mode:
authorrdevlin.cronin <rdevlin.cronin@chromium.org>2015-04-02 14:25:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-02 21:25:59 +0000
commit93a2547e8519ce060379102a611d58f767c72ece (patch)
tree8ca75b24a9c8f14076765d19bd51c2cda334f8b7 /extensions/browser/app_window
parentca43dfb7b9f5209ef5d5912522f015d4d617012b (diff)
downloadchromium_src-93a2547e8519ce060379102a611d58f767c72ece.zip
chromium_src-93a2547e8519ce060379102a611d58f767c72ece.tar.gz
chromium_src-93a2547e8519ce060379102a611d58f767c72ece.tar.bz2
[Extensions] Change ProcessManager to use RenderFrameHosts
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 Review URL: https://codereview.chromium.org/1037263004 Cr-Commit-Position: refs/heads/master@{#323565}
Diffstat (limited to 'extensions/browser/app_window')
-rw-r--r--extensions/browser/app_window/app_window.cc2
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);