| 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 3146b6eca1aa367c304736447f3ab8fd920874c4..f056649c09505a9f6d7bfb33181f2cc16ad7b9b8 100644
|
| --- a/chrome/browser/ui/views/apps/native_app_window_views.h
|
| +++ b/chrome/browser/ui/views/apps/native_app_window_views.h
|
| @@ -91,7 +91,7 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
|
|
|
| void OnViewWasResized();
|
|
|
| - bool ShouldUseChromeStyleFrame() const;
|
| + bool ShouldUseNativeFrame() const;
|
|
|
| // Installs an EasyResizeWindowTargeter on the containing window, which
|
| // allows the window to be resized from within |kResizeInsideBoundsSize|
|
| @@ -188,6 +188,8 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
|
| virtual void HandleKeyboardEvent(
|
| const content::NativeWebKeyboardEvent& event) OVERRIDE;
|
| virtual bool IsFrameless() const OVERRIDE;
|
| + virtual bool HasFrameColor() const OVERRIDE;
|
| + virtual SkColor FrameColor() const OVERRIDE;
|
| virtual gfx::Insets GetFrameInsets() const OVERRIDE;
|
| virtual void HideWithApp() OVERRIDE;
|
| virtual void ShowWithApp() OVERRIDE;
|
| @@ -216,6 +218,8 @@ class NativeAppWindowViews : public apps::NativeAppWindow,
|
| scoped_ptr<SkRegion> draggable_region_;
|
|
|
| bool frameless_;
|
| + bool has_frame_color_;
|
| + SkColor frame_color_;
|
| bool transparent_background_;
|
| gfx::Size preferred_size_;
|
| bool resizable_;
|
|
|