Index: chrome/browser/ui/views/apps/native_app_window_views.h |
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.h b/chrome/browser/ui/views/apps/native_app_window_views.h |
index e238bd865f65ac7692490a570cccff1aba3a5946..caecca39cca94c1999973a8917da83d3d7f01a58 100644 |
--- a/chrome/browser/ui/views/apps/native_app_window_views.h |
+++ b/chrome/browser/ui/views/apps/native_app_window_views.h |
@@ -5,8 +5,8 @@ |
#ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ |
#define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_ |
-#include "apps/native_app_window.h" |
#include "apps/shell_window.h" |
+#include "apps/ui/native_app_window.h" |
#include "base/observer_list.h" |
#include "content/public/browser/web_contents_observer.h" |
#include "third_party/skia/include/core/SkRegion.h" |
@@ -88,6 +88,7 @@ class NativeAppWindowViews : public apps::NativeAppWindow, |
virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; |
virtual void FlashFrame(bool flash) OVERRIDE; |
virtual bool IsAlwaysOnTop() const OVERRIDE; |
+ virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; |
// WidgetDelegate implementation. |
virtual void OnWidgetMove() OVERRIDE; |
@@ -142,10 +143,10 @@ class NativeAppWindowViews : public apps::NativeAppWindow, |
virtual bool IsDetached() const OVERRIDE; |
virtual void UpdateWindowIcon() OVERRIDE; |
virtual void UpdateWindowTitle() OVERRIDE; |
- virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) OVERRIDE; |
virtual void UpdateDraggableRegions( |
const std::vector<extensions::DraggableRegion>& regions) OVERRIDE; |
virtual SkRegion* GetDraggableRegion() OVERRIDE; |
+ virtual void UpdateInputRegion(scoped_ptr<SkRegion> region) OVERRIDE; |
virtual void HandleKeyboardEvent( |
const content::NativeWebKeyboardEvent& event) OVERRIDE; |
virtual bool IsFrameless() const OVERRIDE; |
@@ -153,7 +154,6 @@ class NativeAppWindowViews : public apps::NativeAppWindow, |
virtual bool IsVisible() const OVERRIDE; |
virtual void HideWithApp() OVERRIDE; |
virtual void ShowWithApp() OVERRIDE; |
- virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE; |
// web_modal::WebContentsModalDialogHost implementation. |
virtual gfx::NativeView GetHostView() const OVERRIDE; |