Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / apps / ui / views / native_app_window_views.h

diff --git a/src/apps/ui/views/native_app_window_views.h b/src/apps/ui/views/native_app_window_views.h
index 283e7c1..696cb2f 100644 (file)
--- a/src/apps/ui/views/native_app_window_views.h
+++ b/src/apps/ui/views/native_app_window_views.h
@@ -52,6 +52,8 @@ class NativeAppWindowViews : public NativeAppWindow,
   void Init(AppWindow* app_window,
             const AppWindow::CreateParams& create_params);
 
+  views::Widget* widget() { return widget_; }
+
   void set_window_for_testing(views::Widget* window) { widget_ = window; }
   void set_web_view_for_testing(views::WebView* view) { web_view_ = view; }
 
@@ -59,7 +61,6 @@ class NativeAppWindowViews : public NativeAppWindow,
   AppWindow* app_window() { return app_window_; }
   const AppWindow* app_window() const { return app_window_; }
 
-  views::Widget* widget() { return widget_; }
   const views::Widget* widget() const { return widget_; }
 
   views::WebView* web_view() { return web_view_; }
@@ -145,7 +146,8 @@ class NativeAppWindowViews : public NativeAppWindow,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual bool IsFrameless() const OVERRIDE;
   virtual bool HasFrameColor() const OVERRIDE;
-  virtual SkColor FrameColor() const OVERRIDE;
+  virtual SkColor ActiveFrameColor() const OVERRIDE;
+  virtual SkColor InactiveFrameColor() const OVERRIDE;
   virtual gfx::Insets GetFrameInsets() const OVERRIDE;
   virtual void HideWithApp() OVERRIDE;
   virtual void ShowWithApp() OVERRIDE;