Index: extensions/browser/app_window/app_window.cc |
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc |
index c1959a98c82541c665e543ff7fba235de8b74b5f..4aa2dea923e61f3e6eb79c37cab1b8c13c305e3e 100644 |
--- a/extensions/browser/app_window/app_window.cc |
+++ b/extensions/browser/app_window/app_window.cc |
@@ -30,6 +30,7 @@ |
#include "extensions/browser/app_window/size_constraints.h" |
#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/extension_system.h" |
+#include "extensions/browser/extension_web_contents_observer.h" |
#include "extensions/browser/extensions_browser_client.h" |
#include "extensions/browser/notification_types.h" |
#include "extensions/browser/process_manager.h" |
@@ -258,6 +259,9 @@ void AppWindow::Init(const GURL& url, |
SetViewType(web_contents(), VIEW_TYPE_APP_WINDOW); |
app_delegate_->InitWebContents(web_contents()); |
+ ExtensionWebContentsObserver::GetForWebContents(web_contents())-> |
not at google - send to devlin
2015/06/10 20:48:12
Lack of a CreateForWebContents here is a bit puzzl
Devlin
2015/06/10 20:59:20
Yep, they're created up the stack. In this partic
|
+ dispatcher()->set_delegate(this); |
+ |
WebContentsModalDialogManager::CreateForWebContents(web_contents()); |
web_contents()->SetDelegate(this); |
@@ -922,6 +926,14 @@ blink::WebDisplayMode AppWindow::GetDisplayMode( |
: blink::WebDisplayModeStandalone; |
} |
+WindowController* AppWindow::GetExtensionWindowController() const { |
+ return app_window_contents_->GetWindowController(); |
+} |
+ |
+content::WebContents* AppWindow::GetAssociatedWebContents() const { |
+ return web_contents(); |
+} |
+ |
void AppWindow::OnExtensionUnloaded(BrowserContext* browser_context, |
const Extension* extension, |
UnloadedExtensionInfo::Reason reason) { |