| 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 da0f11758438629a2a7ce9435fc4e3e59a042c29..ffc350409c08553561bb0505f2803a68fa46dd74 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,
|
| const apps::AppWindow::CreateParams& create_params);
|
| void OnViewWasResized();
|
|
|
| - bool ShouldUseChromeStyleFrame() const;
|
| + bool ShouldUseNativeFrame() const;
|
|
|
| // Caller owns the returned object.
|
| apps::AppWindowFrameView* CreateAppWindowFrameView();
|
| @@ -189,6 +189,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;
|
| @@ -217,6 +219,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_;
|
|
|