summaryrefslogtreecommitdiffstats
path: root/extensions/browser/app_window
diff options
context:
space:
mode:
authorTommy C. Li <tommycli@chromium.org>2015-04-02 17:21:10 -0700
committerTommy C. Li <tommycli@chromium.org>2015-04-03 00:23:03 +0000
commitfa6680c30a495db2922bc286b9e5461e5dcc579e (patch)
tree374497676e2d76ad1af747888156e3906dc6ff53 /extensions/browser/app_window
parentbd6b7ec8c71da55fc79039374af97f77e5b2051b (diff)
downloadchromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.zip
chromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.tar.gz
chromium_src-fa6680c30a495db2922bc286b9e5461e5dcc579e.tar.bz2
Revert "[Extensions] Changt cl uploade ProcessManager to use RenderFrameHosts"
This reverts commit 93a2547e8519ce060379102a611d58f767c72ece. BUG= Review URL: https://codereview.chromium.org/1058183002 Cr-Commit-Position: refs/heads/master@{#323574}
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 fc56bae..0689b13 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -253,7 +253,6 @@ 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());
@@ -261,6 +260,7 @@ 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);