| Index: extensions/shell/browser/shell_app_window.h
|
| diff --git a/extensions/shell/browser/shell_app_window.h b/extensions/shell/browser/shell_app_window.h
|
| index d85f4f00d7e6557e4397a315d8f53e3ced591e4f..071e5bd84472d6b627e50c00dffbcb173885cd2e 100644
|
| --- a/extensions/shell/browser/shell_app_window.h
|
| +++ b/extensions/shell/browser/shell_app_window.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/public/browser/web_contents_delegate.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "extensions/browser/extension_function_dispatcher.h"
|
|
|
| @@ -29,10 +30,12 @@ class Size;
|
| namespace extensions {
|
|
|
| class ExtensionFunctionDispatcher;
|
| +class ShellWebContentsDelegate;
|
|
|
| // A simplified app window created by chrome.app.window.create(). Manages the
|
| // primary web contents for the app.
|
| -class ShellAppWindow : public content::WebContentsObserver,
|
| +class ShellAppWindow : public content::WebContentsDelegate,
|
| + public content::WebContentsObserver,
|
| public ExtensionFunctionDispatcher::Delegate {
|
| public:
|
| ShellAppWindow();
|
| @@ -51,10 +54,16 @@ class ShellAppWindow : public content::WebContentsObserver,
|
| // Returns the routing ID of the render view host of |web_contents_|.
|
| int GetRenderViewRoutingID();
|
|
|
| - // content::WebContentsObserver implementation
|
| + // content::WebContentsDelegate overrides:
|
| + virtual void RequestMediaAccessPermission(
|
| + content::WebContents* web_contents,
|
| + const content::MediaStreamRequest& request,
|
| + const content::MediaResponseCallback& callback) OVERRIDE;
|
| +
|
| + // content::WebContentsObserver overrides:
|
| virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
|
|
| - // ExtensionFunctionDispatcher::Delegate implementation
|
| + // ExtensionFunctionDispatcher::Delegate overrides:
|
| virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
|
|
|
| private:
|
|
|