Allow Chrome apps to create Ash Panels (apps v2)

chrome/browser/ui/ash/shell_utility_window_ash.h

 // Copyright (c) 2012 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_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_ASH_SHELL_UTILITY_WINDOW_ASH_H_
+#define CHROME_BROWSER_UI_ASH_SHELL_UTILITY_WINDOW_ASH_H_
 
-#include "chrome/browser/ui/base_window.h"
+#include "base/basictypes.h"
+#include "base/string16.h"
 #include "chrome/browser/ui/extensions/native_shell_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
-#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
-#include "third_party/skia/include/core/SkRegion.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
+#include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/widget/widget_delegate.h"
 
-class ExtensionKeybindingRegistryViews;
+class GURL;
 class Profile;
 
-namespace content {
-class WebContents;
-}
-
-namespace extensions {
-class Extension;
+namespace ash {
+class PanelFrameView;
 }
 
 namespace views {
 class WebView;
+class Widget;
 }
 
-class ShellWindowViews : public NativeShellWindow,
-                         public views::WidgetDelegateView {
+///////////////////////////////////////////////////////////////////////////////
+// ShellUtilityWindowAsh is used to display HTML in a Panel window.
+//
+class ShellUtilityWindowAsh : public NativeShellWindow,

[sky, 2012/11/20 02:05:05]

Isn't there a better way to share code here?

How does this differ than a browser of type panel?

[stevenjb, 2012/11/20 21:20:58]

Probably, yes. I've been thinking about the best way to do this. Options
include:

0. Keep this independent of ShellWindowViews, the code duplication is fairly
small and it keeps the amount of class hierarchy minimal.
1. Make ShellWindowViews panel-aware and don't create a separate class for
utility windows.
2. Make this class inherit from ShellWindowViews.
3. Create a common class, NativeShellWindowViews, and have ShellWindowViews and
ShellUtilityWindowAsh inherit from that.

I'm leaning towards 3. I'm not particularly fond of 1.

Jeremy, thoughts? 

I'm not sure I understand the second question; ShellWindow is an Apps v2 window
and is pretty much unrelated to Browser. Apps v2 panels, aka Utility Windows,
will also be independent of Browser. Eventually we hope to provide enough hooks
for apps v1 panels on Ash to also use Ash Utility Windows, but that is a
separate task that we can take on once we decide whether or not we actually like
the Utility Window design.

[sky, 2012/11/21 00:39:42]

I like 3 too.

My second question was around whether you could get what you want from a
browser, but it sounds like no.

+                              public views::WidgetDelegateView {
  public:
-  ShellWindowViews(ShellWindow* shell_window,
-                   const ShellWindow::CreateParams& params);
-
-  bool frameless() const { return frameless_; }
-  SkRegion* draggable_region() { return draggable_region_.get(); }
+  ShellUtilityWindowAsh(ShellWindow* shell_window,
+                        const ShellWindow::CreateParams& create_params);
+  virtual ~ShellUtilityWindowAsh();
 
   // BaseWindow implementation.
   virtual bool IsActive() const OVERRIDE;
   virtual bool IsMaximized() const OVERRIDE;
   virtual bool IsMinimized() const OVERRIDE;
   virtual bool IsFullscreen() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
   virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
   virtual gfx::Rect GetBounds() const OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ShowInactive() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void Activate() OVERRIDE;
   virtual void Deactivate() OVERRIDE;
   virtual void Maximize() OVERRIDE;
   virtual void Minimize() OVERRIDE;
   virtual void Restore() OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void FlashFrame(bool flash) OVERRIDE;
   virtual bool IsAlwaysOnTop() const OVERRIDE;
+  // TODO(stevenjb): Make virtual when merging with CL:11369237
+  gfx::Insets GetFrameInsets() const;
 
   // WidgetDelegate implementation.
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::NonClientFrameView* CreateNonClientFrameView(
       views::Widget* widget) OVERRIDE;
+  virtual void DeleteDelegate() OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
-  virtual bool CanMaximize() const OVERRIDE;
+  virtual string16 GetWindowTitle() const OVERRIDE;
+  virtual bool ShouldShowWindowTitle() const OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
-  virtual void DeleteDelegate() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
-  virtual bool ShouldDescendIntoChildForEventHandling(
-      gfx::NativeView child,
-      const gfx::Point& location) OVERRIDE;
-  virtual gfx::ImageSkia GetWindowAppIcon() OVERRIDE;
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual bool ShouldShowWindowTitle() const OVERRIDE;
-  virtual void OnWidgetMove() OVERRIDE;
 
  protected:
   // views::View implementation.
   virtual void Layout() OVERRIDE;
   virtual void ViewHierarchyChanged(
       bool is_add, views::View *parent, views::View *child) OVERRIDE;
-  virtual gfx::Size GetMinimumSize() OVERRIDE;
-  virtual gfx::Size GetMaximumSize() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnFocus() OVERRIDE;
 
-  Profile* profile() { return shell_window_->profile(); }
-  content::WebContents* web_contents() {
-    return shell_window_->web_contents();
-  }
-  const extensions::Extension* extension() {
-    return shell_window_->extension();
-  }
-
-  // views::WidgetDelegate implementation.
-  virtual void SaveWindowPlacement(const gfx::Rect& bounds,
-                                   ui::WindowShowState show_state) OVERRIDE;
-
  private:
-  friend class ShellWindowFrameView;
-
-  virtual ~ShellWindowViews();
-
   // NativeShellWindow implementation.
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;
   virtual bool IsFullscreenOrPending() const OVERRIDE;
   virtual void UpdateWindowIcon() OVERRIDE;
   virtual void UpdateWindowTitle() OVERRIDE;
   virtual void UpdateDraggableRegions(
       const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
   virtual void HandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void RenderViewHostChanged() OVERRIDE;
 
-  void OnViewWasResized();
+  ShellWindow* shell_window_;  // weak - ShellWindow owns this
+  views::WebView* web_view_;
+  views::Widget* window_;  // Unowned
+  ash::PanelFrameView* panel_frame_view_;  // Unowned
+  gfx::Size preferred_size_;
+  bool frameless_;
 
-  ShellWindow* shell_window_; // weak - ShellWindow owns NativeShellWindow.
-
-  views::WebView* web_view_;
-  views::Widget* window_;
-  bool is_fullscreen_;
-
-  scoped_ptr<SkRegion> draggable_region_;
-
-  bool frameless_;
-  gfx::Size minimum_size_;
-  gfx::Size maximum_size_;
-
-  // The class that registers for keyboard shortcuts for extension commands.
-  scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
-
-  UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellWindowViews);
+  DISALLOW_COPY_AND_ASSIGN(ShellUtilityWindowAsh);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_SHELL_WINDOW_VIEWS_H_
+#endif  // CHROME_BROWSER_UI_ASH_SHELL_UTILITY_WINDOW_ASH_H_