Support panel titles and Icons for v1 apps

chrome/browser/ui/views/extensions/native_app_window_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/extensions/native_app_window_views.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/shell_window_frame_view.h"
@@ skipping 38 matching lines @@
       web_view_(NULL),
       window_(NULL),
       is_fullscreen_(false),
       frameless_(create_params.frame == ShellWindow::FRAME_NONE),
       transparent_background_(create_params.transparent_background) {
   Observe(shell_window_->web_contents());
   minimum_size_ = create_params.minimum_size;
   maximum_size_ = create_params.maximum_size;
 
   window_ = new views::Widget;
-  if (create_params.window_type == ShellWindow::WINDOW_TYPE_PANEL)
+  if (create_params.window_type == ShellWindow::WINDOW_TYPE_PANEL ||
+      create_params.window_type == ShellWindow::WINDOW_TYPE_V1_PANEL) {
     InitializePanelWindow(create_params);
-  else
+  } else {
     InitializeDefaultWindow(create_params);
-
+  }
   extension_keybinding_registry_.reset(
       new ExtensionKeybindingRegistryViews(
           profile(),
           window_->GetFocusManager(),
           extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
           shell_window_));
 
   OnViewWasResized();
   window_->AddObserver(this);
 }
@@ skipping 64 matching lines @@
   // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
   // could plumb context through to here in some cases.
   params.top_level = true;
   window_->Init(params);
 
 #if !defined(USE_ASH)
   // TODO(oshima|stevenjb): Ideally, we should be able to just pre-determine
   // the exact location and size, but this doesn't work well
   // on non-ash environment where we don't have full control over
   // window management.
-  gfx::Rect window_bounds =
-      window_->non_client_view()->GetWindowBoundsForClientBounds(
-          create_params.bounds);
-  window_->SetBounds(window_bounds);
+  if (ash::Shell::HasInstance()) {

[jeremya, 2013/02/15 03:28:16]

not sure I understand this -- won't the 'ash' namespace be undefined if
!defined(USE_ASH)?

[stevenjb, 2013/02/15 18:26:35]

This was a mistake and will be removed.

+    gfx::Rect window_bounds =
+        window_->non_client_view()->GetWindowBoundsForClientBounds(
+            create_params.bounds);
+    window_->SetBounds(window_bounds);
+  }
 #endif
 }
 
 // BaseWindow implementation.
 
 bool NativeAppWindowViews::IsActive() const {
   return window_->IsActive();
 }
 
 bool NativeAppWindowViews::IsMaximized() const {
@@ skipping 65 matching lines @@
 
 void NativeAppWindowViews::SetBounds(const gfx::Rect& bounds) {
   GetWidget()->SetBounds(bounds);
 }
 
 void NativeAppWindowViews::FlashFrame(bool flash) {
   window_->FlashFrame(flash);
 }
 
 bool NativeAppWindowViews::IsAlwaysOnTop() const {
-  return shell_window_->window_type() == ShellWindow::WINDOW_TYPE_PANEL;
+  return shell_window_->window_type_panel();
 }
 
 gfx::Insets NativeAppWindowViews::GetFrameInsets() const {
   if (frameless())
     return gfx::Insets();
 
   // The pretend client_bounds passed in need to be large enough to ensure that
   // GetWindowBoundsForClientBounds() doesn't decide that it needs more than
   // the specified amount of space to fit the window controls in, and return a
   // number larger than the real frame insets. Most window controls are smaller
@@ skipping 75 matching lines @@
 
 bool NativeAppWindowViews::CanMaximize() const {
   return maximum_size_.IsEmpty();
 }
 
 string16 NativeAppWindowViews::GetWindowTitle() const {
   return shell_window_->GetTitle();
 }
 
 bool NativeAppWindowViews::ShouldShowWindowTitle() const {
-  return false;
+  return shell_window_->window_type() == ShellWindow::WINDOW_TYPE_V1_PANEL;

[jeremya, 2013/02/15 03:28:16]

This class is getting pretty tangly :(

[stevenjb, 2013/02/15 18:26:35]

I wasn't in favor of doing the hack, but we decided it was important to support
v1 app panels... trying to compramise between tangly and mass code
duplication...

 }
 
 gfx::ImageSkia NativeAppWindowViews::GetWindowAppIcon() {
   gfx::Image app_icon = shell_window_->app_icon();
   if (app_icon.IsEmpty())
     return GetWindowIcon();
   else
     return *app_icon.ToImageSkia();
 }
 
 gfx::ImageSkia NativeAppWindowViews::GetWindowIcon() {
   content::WebContents* web_contents = shell_window_->web_contents();
   if (web_contents) {
     FaviconTabHelper* favicon_tab_helper =
         FaviconTabHelper::FromWebContents(web_contents);
     gfx::Image app_icon = favicon_tab_helper->GetFavicon();
     if (!app_icon.IsEmpty())
       return *app_icon.ToImageSkia();
   }
   return gfx::ImageSkia();
 }
 
+bool NativeAppWindowViews::ShouldShowWindowIcon() const {
+  return shell_window_->window_type() == ShellWindow::WINDOW_TYPE_V1_PANEL;

[jeremya, 2013/02/15 03:28:16]

What does this do on Windows (or do we never create V1_PANEL types there?)

[stevenjb, 2013/02/15 18:26:35]

We won't create V1_PANEL on Windows. That scenario is complicated enough now
that we can have Ash + non ash windows on Win7/8.

+}
+
 void NativeAppWindowViews::SaveWindowPlacement(const gfx::Rect& bounds,
                                                ui::WindowShowState show_state) {
   views::WidgetDelegate::SaveWindowPlacement(bounds, show_state);
   shell_window_->OnNativeWindowChanged();
 }
 
 void NativeAppWindowViews::DeleteDelegate() {
   window_->RemoveObserver(this);
   shell_window_->OnNativeClose();
 }
 
 views::Widget* NativeAppWindowViews::GetWidget() {
   return window_;
 }
 
 const views::Widget* NativeAppWindowViews::GetWidget() const {
   return window_;
 }
 
 views::NonClientFrameView* NativeAppWindowViews::CreateNonClientFrameView(
     views::Widget* widget) {
 #if defined(USE_ASH)
   if (chrome::IsNativeViewInAsh(widget->GetNativeView())) {
-    if (shell_window_->window_type() == ShellWindow::WINDOW_TYPE_PANEL) {
+    if (shell_window_->window_type_panel()) {
       ash::PanelFrameView::FrameType frame_type = frameless_ ?
           ash::PanelFrameView::FRAME_NONE : ash::PanelFrameView::FRAME_ASH;
       return new ash::PanelFrameView(widget, frame_type);
     }
     if (!frameless_) {
       ash::CustomFrameViewAsh* frame = new ash::CustomFrameViewAsh();
       frame->Init(widget);
       return frame;
     }
   }
@@ skipping 79 matching lines @@
 }
 
 void NativeAppWindowViews::OnFocus() {
   web_view_->RequestFocus();
 }
 
 // NativeAppWindow implementation.
 
 void NativeAppWindowViews::SetFullscreen(bool fullscreen) {
   // Fullscreen not supported by panels.
-  if (shell_window_->window_type() == ShellWindow::WINDOW_TYPE_PANEL)
+  if (shell_window_->window_type_panel())
     return;
   is_fullscreen_ = fullscreen;
   window_->SetFullscreen(fullscreen);
   // TODO(jeremya) we need to call RenderViewHost::ExitFullscreen() if we
   // ever drop the window out of fullscreen in response to something that
   // wasn't the app calling webkitCancelFullScreen().
 }
 
 bool NativeAppWindowViews::IsFullscreenOrPending() const {
   return is_fullscreen_;
@@ skipping 32 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 // NativeAppWindow::Create
 
 // static
 NativeAppWindow* NativeAppWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new NativeAppWindowViews(shell_window, params);
 }