diff options
| -rw-r--r-- | apps/DEPS | 1 | ||||
| -rw-r--r-- | apps/app_window.cc | 6 | ||||
| -rw-r--r-- | apps/app_window.h | 6 | ||||
| -rw-r--r-- | apps/app_window_contents.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/apps/native_app_window_gtk.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/apps/chrome_native_app_window_views.cc | 2 |
7 files changed, 5 insertions, 16 deletions
@@ -31,7 +31,6 @@ include_rules = [ "+chrome/browser/extensions/extension_function_dispatcher.h", "+chrome/browser/extensions/extension_icon_image.h", "+chrome/browser/extensions/extension_host.h", - "+chrome/browser/extensions/extension_keybinding_registry.h", "+chrome/browser/extensions/extension_web_contents_observer.h", "+chrome/browser/extensions/suggest_permission_util.h", "+chrome/browser/extensions/unpacked_installer.h", diff --git a/apps/app_window.cc b/apps/app_window.cc index 57047b2..8bb2b7e 100644 --- a/apps/app_window.cc +++ b/apps/app_window.cc @@ -831,12 +831,6 @@ bool AppWindow::IsWebContentsVisible(content::WebContents* web_contents) { return delegate_->IsWebContentsVisible(web_contents); } -extensions::ActiveTabPermissionGranter* -AppWindow::GetActiveTabPermissionGranter() { - // App windows don't support the activeTab permission. - return NULL; -} - WebContentsModalDialogHost* AppWindow::GetWebContentsModalDialogHost() { return native_app_window_.get(); } diff --git a/apps/app_window.h b/apps/app_window.h index 8403153..2614a40 100644 --- a/apps/app_window.h +++ b/apps/app_window.h @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/extension_icon_image.h" -#include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/sessions/session_id.h" #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h" #include "content/public/browser/notification_observer.h" @@ -82,7 +81,6 @@ class AppWindow : public content::NotificationObserver, public content::WebContentsDelegate, public content::WebContentsObserver, public web_modal::WebContentsModalDialogManagerDelegate, - public extensions::ExtensionKeybindingRegistry::Delegate, public extensions::IconImage::Observer { public: enum WindowType { @@ -424,10 +422,6 @@ class AppWindow : public content::NotificationObserver, // Update the always-on-top bit in the native app window. void UpdateNativeAlwaysOnTop(); - // extensions::ExtensionKeybindingRegistry::Delegate implementation. - virtual extensions::ActiveTabPermissionGranter* - GetActiveTabPermissionGranter() OVERRIDE; - // web_modal::WebContentsModalDialogManagerDelegate implementation. virtual web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost() OVERRIDE; diff --git a/apps/app_window_contents.cc b/apps/app_window_contents.cc index 8fa3c46..d50db9e 100644 --- a/apps/app_window_contents.cc +++ b/apps/app_window_contents.cc @@ -10,6 +10,8 @@ #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/resource_dispatcher_host.h" diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm index cbaaa43..53812b9 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm @@ -372,7 +372,7 @@ NativeAppWindowCocoa::NativeAppWindowCocoa( Profile::FromBrowserContext(app_window_->browser_context()), window, extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, - app_window)); + NULL)); } NSUInteger NativeAppWindowCocoa::GetWindowStyleMask() const { diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc index 9244ca0..1216992 100644 --- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc +++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc @@ -151,7 +151,7 @@ NativeAppWindowGtk::NativeAppWindowGtk(AppWindow* app_window, Profile::FromBrowserContext(app_window_->browser_context()), window_, extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, - app_window_)); + NULL)); ui::ActiveWindowWatcherX::AddObserver(this); } diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc index 2135d97..29291b3 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -670,7 +670,7 @@ void ChromeNativeAppWindowViews::InitializeWindow( Profile::FromBrowserContext(app_window->browser_context()), window()->GetFocusManager(), extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, - app_window)); + NULL)); #if defined(OS_WIN) if (ShouldUseNativeFrame() && |