Update Panel UI looks on Windows.

chrome/browser/ui/panels/panel_browser_frame_view.cc

 // Copyright (c) 2011 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/panels/panel_browser_frame_view.h"
 
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/ui/panels/about_panel_bubble.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/image_button.h"
+#include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
+#include "views/controls/menu/menu_2.h"
 #include "views/painter.h"
 #include "views/screen.h"
 #include "views/window/window.h"
 #include "views/window/window_shape.h"
 
 #if !defined(OS_WIN)
 #include "views/window/hit_test.h"
 #endif
 
 namespace {
@@ skipping 47 matching lines @@
     top = rb.GetBitmapNamed(top_id);
     top_right = rb.GetBitmapNamed(top_right_id);
     right = rb.GetBitmapNamed(right_id);
     bottom_right = rb.GetBitmapNamed(bottom_right_id);
     bottom = rb.GetBitmapNamed(bottom_id);
     bottom_left = rb.GetBitmapNamed(bottom_left_id);
     left = rb.GetBitmapNamed(left_id);
   }
 };
 
-ButtonResources info_button_resources;
+ButtonResources settings_button_resources;
 ButtonResources close_button_resources;
 EdgeResources frame_edges;
 EdgeResources client_edges;
 gfx::Font* active_font = NULL;
 gfx::Font* inactive_font = NULL;
 
 void LoadImageResources() {
-  // TODO(jianli): Use the right icon for the info button.
-  info_button_resources.SetResources(
+  settings_button_resources.SetResources(
       IDR_BALLOON_WRENCH, 0, IDR_BALLOON_WRENCH_H, IDR_BALLOON_WRENCH_P);
 
   close_button_resources.SetResources(
       IDR_TAB_CLOSE, IDR_TAB_CLOSE_MASK, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE_P);
 
   frame_edges.SetResources(
       IDR_WINDOW_TOP_LEFT_CORNER, IDR_WINDOW_TOP_CENTER,
       IDR_WINDOW_TOP_RIGHT_CORNER, IDR_WINDOW_RIGHT_SIDE,
       IDR_WINDOW_BOTTOM_RIGHT_CORNER, IDR_WINDOW_BOTTOM_CENTER,
       IDR_WINDOW_BOTTOM_LEFT_CORNER, IDR_WINDOW_LEFT_SIDE);
@@ skipping 73 matching lines @@
 }
 
 // PanelBrowserFrameView -------------------------------------------------------
 
 PanelBrowserFrameView::PanelBrowserFrameView(BrowserFrame* frame,
                                              PanelBrowserView* browser_view)
     : BrowserNonClientFrameView(),
       frame_(frame),
       browser_view_(browser_view),
       paint_state_(NOT_PAINTED),
-      info_button_(NULL),
+      settings_button_(NULL),
       close_button_(NULL),
       title_icon_(NULL),
       title_label_(NULL) {
   EnsureResourcesInitialized();
   frame_->set_frame_type(views::Window::FRAME_TYPE_FORCE_CUSTOM);
 
-  info_button_ = new views::ImageButton(this);
-  info_button_->SetImage(views::CustomButton::BS_NORMAL,
-                         info_button_resources.normal_image);
-  info_button_->SetImage(views::CustomButton::BS_HOT,
-                         info_button_resources.hover_image);
-  info_button_->SetImage(views::CustomButton::BS_PUSHED,
-                         info_button_resources.pushed_image);
-  info_button_->SetTooltipText(
-      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_ABOUT_PANEL)));
-  info_button_->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_ACCNAME_ABOUT_PANEL));
-  info_button_->SetVisible(false);
-  AddChildView(info_button_);
+  settings_button_ =  new views::MenuButton(NULL, std::wstring(), this, false);
+  settings_button_->SetIcon(*(settings_button_resources.normal_image));
+  settings_button_->SetHoverIcon(*(settings_button_resources.hover_image));
+  settings_button_->SetPushedIcon(*(settings_button_resources.pushed_image));
+  settings_button_->set_alignment(views::TextButton::ALIGN_CENTER);
+  settings_button_->set_border(NULL);
+  settings_button_->SetTooltipText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS)));
+  settings_button_->SetAccessibleName(
+      l10n_util::GetStringUTF16(IDS_NEW_TAB_APP_SETTINGS));
+  settings_button_->SetVisible(false);
+  AddChildView(settings_button_);
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           close_button_resources.normal_image);
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           close_button_resources.hover_image);
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
                           close_button_resources.pushed_image);
   close_button_->SetTooltipText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_TOOLTIP_CLOSE_TAB)));
@@ skipping 93 matching lines @@
                       PAINT_AS_ACTIVE : PAINT_AS_INACTIVE);
   PaintFrameBorder(canvas);
   PaintClientEdge(canvas);
 }
 
 void PanelBrowserFrameView::OnThemeChanged() {
   LoadImageResources();
 }
 
 void PanelBrowserFrameView::Layout() {
-  // Now that we know we have a parent, we can safely set our theme colors.
-  SkColor title_color =
-      GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT);
-  title_label_->SetColor(title_color);
-  close_button_->SetBackground(title_color,
-                               close_button_resources.normal_image,
-                               close_button_resources.mask_image);
-
   // Layout the close button.
   gfx::Size close_button_size = close_button_->GetPreferredSize();
   close_button_->SetBounds(
       width() - kFrameBorderThickness - kButtonSpacing -
           close_button_size.width(),
       (NonClientTopBorderHeight() - close_button_size.height()) / 2,
       close_button_size.width(),
       close_button_size.height());
 
-  // Layout the info button.
-  gfx::Size info_button_size = info_button_->GetPreferredSize();
-  info_button_->SetBounds(
-      close_button_->x() - kButtonSpacing - info_button_size.width(),
-      (NonClientTopBorderHeight() - info_button_size.height()) / 2,
-      info_button_size.width(),
-      info_button_size.height());
+  // Layout the settings button.
+  gfx::Size settings_button_size = settings_button_->GetPreferredSize();
+  settings_button_->SetBounds(
+      close_button_->x() - kButtonSpacing - settings_button_size.width(),
+      (NonClientTopBorderHeight() - settings_button_size.height()) / 2,
+      settings_button_size.width(),
+      settings_button_size.height());
 
   // Layout the icon.
   int icon_y = (NonClientTopBorderHeight() - kIconSize) / 2;
   title_icon_->SetBounds(
       kFrameBorderThickness + kIconSpacing,
       icon_y,
       kIconSize,
       kIconSize);
 
   // Layout the title.
   int title_x = title_icon_->bounds().right() + kIconSpacing;
   int title_height = BrowserFrame::GetTitleFont().GetHeight();
   title_label_->SetBounds(
       title_x,
       icon_y + ((kIconSize - title_height - 1) / 2),
-      std::max(0, info_button_->x() - kButtonSpacing - title_x),
+      std::max(0, settings_button_->x() - kButtonSpacing - title_x),
       title_height);
 
   // Calculate the client area bounds.
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   client_view_bounds_.SetRect(
       border_thickness,
       top_height,
       std::max(0, width() - (2 * border_thickness)),
       std::max(0, height() - top_height - border_thickness));
@@ skipping 24 matching lines @@
 void PanelBrowserFrameView::OnMouseCaptureLost() {
   if (browser_view_->OnTitleBarMouseCaptureLost())
     return;
   BrowserNonClientFrameView::OnMouseCaptureLost();
 }
 
 void PanelBrowserFrameView::ButtonPressed(views::Button* sender,
                                           const views::Event& event) {
   if (sender == close_button_)
     frame_->Close();
-  else if (sender == info_button_) {
-    gfx::Point origin(info_button_->bounds().origin());
-    views::View::ConvertPointToScreen(this, &origin);
-    AboutPanelBubble::Show(
-        GetWidget(),
-        gfx::Rect(origin, info_button_->bounds().size()),
-        BubbleBorder::BOTTOM_RIGHT,
-        GetFaviconForTabIconView(),
-        browser_view_->browser());
+}
+
+void PanelBrowserFrameView::RunMenu(View* source, const gfx::Point& pt) {
+  EnsureCreateSettingsMenu();

[jennb, 2011/06/01 23:45:53]

usual wording is EnsureSettingsMenuCreated()

+  settings_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
+}
+
+bool PanelBrowserFrameView::IsCommandIdChecked(int command_id) const {
+  // Nothing in the menu is checked.
+  return false;
+}
+
+bool PanelBrowserFrameView::IsCommandIdEnabled(int command_id) const {
+  const Extension* extension = GetExtension();
+  if (!extension)
+    return false;
+
+  switch (command_id) {
+    case COMMAND_NAME:
+      // The NAME links to the Homepage URL. If the extension doesn't have a
+      // homepage, we just disable this menu item.
+      return extension->GetHomepageURL().is_valid();
+    case COMMAND_CONFIGURE:
+      return extension->options_url().spec().length() > 0;
+    case COMMAND_DISABLE:
+    case COMMAND_UNINSTALL:
+      // Some extension types can not be disabled or uninstalled.
+      return Extension::UserMayDisable(extension->location());
+    case COMMAND_MANAGE:
+      return true;
+    default:
+      NOTREACHED();
+      return false;
+  }
+}
+
+bool PanelBrowserFrameView::GetAcceleratorForCommandId(
+    int command_id, ui::Accelerator* accelerator) {
+  return false;
+}
+
+void PanelBrowserFrameView::ExecuteCommand(int command_id) {
+  const Extension* extension = GetExtension();
+  if (!extension)
+    return;
+
+  Browser* browser = browser_view_->browser();
+  switch (command_id) {
+    case COMMAND_NAME:
+     browser->OpenURL(extension->GetHomepageURL(),
+                      GURL(),
+                      NEW_FOREGROUND_TAB,
+                      PageTransition::LINK);
+      break;
+    case COMMAND_CONFIGURE:
+      DCHECK(!extension->options_url().is_empty());
+      browser->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage(
+          extension, browser);
+      break;
+    case COMMAND_DISABLE:
+      browser->GetProfile()->GetExtensionService()->DisableExtension(
+          extension->id());
+      break;
+    case COMMAND_UNINSTALL:
+      // TODO(jianli): Need to handle the case that the extension API requests
+      // the panel to be closed when the uninstall dialog is still showing.
+      extension_uninstall_dialog_.reset(new ExtensionUninstallDialog(
+          browser->GetProfile()));
+      extension_uninstall_dialog_->ConfirmUninstall(this, extension);
+      break;
+    case COMMAND_MANAGE:
+      browser->OpenURL(GURL(chrome::kChromeUIExtensionsURL),
+                            GURL(),
+                            SINGLETON_TAB,
+                            PageTransition::LINK);
+      break;
+    default:
+      NOTREACHED();
+      break;
   }
 }
 
 bool PanelBrowserFrameView::ShouldTabIconViewAnimate() const {
   // This function is queried during the creation of the window as the
   // TabIconView we host is initialized, so we need to NULL check the selected
   // TabContents because in this condition there is not yet a selected tab.
   TabContents* current_tab = browser_view_->GetSelectedTabContents();
   return current_tab ? current_tab->is_loading() : false;
 }
 
 SkBitmap PanelBrowserFrameView::GetFaviconForTabIconView() {
   return frame_->window_delegate()->GetWindowIcon();
 }
 
+void PanelBrowserFrameView::ExtensionDialogAccepted() {
+  const Extension* extension = GetExtension();
+  if (extension) {
+    browser_view_->browser()->GetProfile()->GetExtensionService()->
+        UninstallExtension(extension->id(), false, NULL);
+  }
+}
+
+void PanelBrowserFrameView::ExtensionDialogCanceled() {
+}
+
 int PanelBrowserFrameView::NonClientBorderThickness() const {
   return kFrameBorderThickness + kClientEdgeThickness;
 }
 
 int PanelBrowserFrameView::NonClientTopBorderHeight() const {
   return kFrameBorderThickness + kTitleBarHeight + kClientEdgeThickness;
 }
 
 void PanelBrowserFrameView::UpdateControlStyles(PaintState paint_state) {
   DCHECK(paint_state != NOT_PAINTED);
 
   if (paint_state == paint_state_)
     return;
   paint_state_ = paint_state;
 
-  // For now, the only indication is whether the font is bold or not.
+  SkColor title_color = GetThemeProvider()->
+      GetColor(paint_state == PAINT_AS_ACTIVE ?
+          ThemeService::COLOR_TAB_TEXT :
+          ThemeService::COLOR_BACKGROUND_TAB_TEXT);
+  title_label_->SetColor(title_color);
   title_label_->SetFont(
       paint_state == PAINT_AS_ACTIVE ? *active_font : *inactive_font);
+
+  close_button_->SetBackground(title_color,
+                               close_button_resources.normal_image,
+                               close_button_resources.mask_image);
 }
 
 void PanelBrowserFrameView::PaintFrameBorder(gfx::Canvas* canvas) {
-  SkBitmap* theme_frame = GetThemeProvider()->GetBitmapNamed(IDR_THEME_TOOLBAR);
+  SkBitmap* theme_frame = GetThemeProvider()->GetBitmapNamed(
+      (paint_state_ == PAINT_AS_ACTIVE) ? IDR_THEME_TOOLBAR
+                                       : IDR_THEME_TAB_BACKGROUND);
 
   // Draw the theme frame.
   canvas->TileImageInt(*theme_frame, 0, 0, width(), height());
 
   // Draw the top border.
   canvas->DrawBitmapInt(*(frame_edges.top_left), 0, 0);
   canvas->TileImageInt(
       *(frame_edges.top), frame_edges.top_left->width(), 0,
       width() - frame_edges.top_right->width(), frame_edges.top->height());
   canvas->DrawBitmapInt(
@@ skipping 71 matching lines @@
       client_view_bounds_.x() - client_edges.left->width(),
       client_area_top, client_edges.left->width(), client_area_height);
 }
 
 void PanelBrowserFrameView::UpdateTitleBar() {
   title_label_->SetText(
       frame_->window_delegate()->GetWindowTitle());
 }
 
 void PanelBrowserFrameView::OnActivationChanged(bool active) {
-  UpdateInfoButtonVisibility(active, mouse_watcher_->IsCursorInViewBounds());
+  UpdateSettingsButtonVisibility(active,
+                                 mouse_watcher_->IsCursorInViewBounds());
   SchedulePaint();
 }
 
 void PanelBrowserFrameView::OnMouseEnterOrLeaveWindow(bool mouse_entered) {
-  UpdateInfoButtonVisibility(browser_view_->panel()->IsActive(),
-                             mouse_entered);
+  // Panel might be closed when we still watch the mouse event.
+  if (!browser_view_->panel())
+    return;
+  UpdateSettingsButtonVisibility(browser_view_->panel()->IsActive(),
+                                 mouse_entered);
 }
 
-void PanelBrowserFrameView::UpdateInfoButtonVisibility(bool active,
-                                                       bool cursor_in_view) {
-  info_button_->SetVisible(active || cursor_in_view);
+void PanelBrowserFrameView::UpdateSettingsButtonVisibility(
+    bool active, bool cursor_in_view) {
+  settings_button_->SetVisible(active || cursor_in_view);
 }
+
+const Extension* PanelBrowserFrameView::GetExtension() const {
+  return Panel::GetExtension(browser_view_->browser());
+}
+
+void PanelBrowserFrameView::EnsureCreateSettingsMenu() {
+  if (settings_menu_.get())
+    return;
+
+  const Extension* extension = GetExtension();
+  if (!extension)
+    return;
+
+  settings_menu_contents_.reset(new ui::SimpleMenuModel(this));
+
+  settings_menu_contents_->AddItem(
+      COMMAND_NAME, UTF8ToUTF16(extension->name()));
+  settings_menu_contents_->AddSeparator();
+  settings_menu_contents_->AddItem(
+      COMMAND_CONFIGURE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS));
+  settings_menu_contents_->AddItem(
+      COMMAND_DISABLE, l10n_util::GetStringUTF16(IDS_EXTENSIONS_DISABLE));
+  settings_menu_contents_->AddItem(
+      COMMAND_UNINSTALL, l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL));
+  settings_menu_contents_->AddSeparator();
+  settings_menu_contents_->AddItem(
+      COMMAND_MANAGE, l10n_util::GetStringUTF16(IDS_MANAGE_EXTENSIONS));
+
+  settings_menu_.reset(new views::Menu2(settings_menu_contents_.get()));
+}