Add frame color option to packaged app windows.

chrome/browser/ui/views/apps/native_app_window_views.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "apps/app_window.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
@@ skipping 73 matching lines @@
   virtual void InitializePanelWindow(
       const apps::AppWindow::CreateParams& create_params);
 
  private:
   friend class ShapedAppWindowTargeterTest;
   FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest,
                            ResizeInsetsWithinBounds);
 
   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|
   // pixels inside the window bounds.
   void InstallEasyResizeTargeterOnContainer() const;
 
   // Caller owns the returned object.
   apps::AppWindowFrameView* CreateAppWindowFrameView();
 
   // ui::BaseWindow implementation.
@@ skipping 76 matching lines @@
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
   virtual void UpdateBadgeIcon() OVERRIDE;
   virtual void UpdateDraggableRegions(
       const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
   virtual SkRegion* GetDraggableRegion() OVERRIDE;
   virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
   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;
   virtual void UpdateWindowMinMaxSize() OVERRIDE;
 
   // web_modal::WebContentsModalDialogHost implementation.
   virtual gfx::NativeView GetHostView() const OVERRIDE;
   virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
   virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
   virtual void AddObserver(
       web_modal::ModalDialogHostObserver* observer) OVERRIDE;
   virtual void RemoveObserver(
       web_modal::ModalDialogHostObserver* observer) OVERRIDE;
 
   content::WebContents* web_contents() { return app_window_->web_contents(); }
 
   apps::AppWindow* app_window_;  // Not owned.
   views::WebView* web_view_;
   views::Widget* window_;
   bool is_fullscreen_;
 
   // Custom shape of the window. If this is not set then the window has a
   // default shape, usually rectangular.
   scoped_ptr<SkRegion> shape_;
 
   scoped_ptr<SkRegion> draggable_region_;
 
   bool frameless_;
+  bool has_frame_color_;
+  SkColor frame_color_;
   bool transparent_background_;
   gfx::Size preferred_size_;
   bool resizable_;
 
   // The class that registers for keyboard shortcuts for extension commands.
   scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
 
   views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
 #if defined(USE_ASH)
   // Used to put non-frameless windows into immersive fullscreen on ChromeOS. In
   // immersive fullscreen, the window header (title bar and window controls)
   // slides onscreen as an overlay when the mouse is hovered at the top of the
   // screen.
   scoped_ptr<ash::ImmersiveFullscreenController>
       immersive_fullscreen_controller_;
 #endif
 
   ObserverList<web_modal::ModalDialogHostObserver> observer_list_;
 
   base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_