Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc |
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 03279efb1001b56bb74767c7b3d09266cd17f7f1..f8038a3abedc9fe4b92c4b630a2f30f66ec61352 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 |
@@ -332,11 +332,14 @@ void ChromeNativeAppWindowViews::InitializePanelWindow( |
} |
void ChromeNativeAppWindowViews::InstallEasyResizeTargeterOnContainer() const { |
- aura::Window* root_window = widget()->GetNativeWindow()->GetRootWindow(); |
+ aura::Window* window = widget()->GetNativeWindow(); |
gfx::Insets inset(kResizeInsideBoundsSize, kResizeInsideBoundsSize, |
kResizeInsideBoundsSize, kResizeInsideBoundsSize); |
- root_window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( |
- new wm::EasyResizeWindowTargeter(root_window, inset, inset))); |
+ // Add the EasyResizeWindowTargeter on the window, not its root window. The |
+ // root window does not have a delegate, so it will not handle the event in |
+ // Linux. |
+ window->SetEventTargeter(scoped_ptr<ui::EventTargeter>( |
+ new wm::EasyResizeWindowTargeter(window, inset, inset))); |
} |
apps::AppWindowFrameView* |
@@ -671,7 +674,7 @@ void ChromeNativeAppWindowViews::InitializeWindow( |
extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY, |
NULL)); |
-#if defined(OS_WIN) |
+#if !defined(OS_CHROMEOS) |
if ((IsFrameless() || has_frame_color_) && |
chrome::GetHostDesktopTypeForNativeWindow(widget()->GetNativeWindow()) != |
chrome::HOST_DESKTOP_TYPE_ASH) { |