Add options menu on Windows.

chrome/browser/ui/panels/panel_browser_frame_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 class PanelBrowserView;
 namespace views {
 class ImageButton;
 class Label;
+class Menu2;
 class MenuButton;
 }
 
 class PanelBrowserFrameView : public BrowserNonClientFrameView,
                               public views::ButtonListener,
                               public views::ViewMenuDelegate,
+                              public ui::SimpleMenuModel::Delegate,
                               public TabIconView::TabIconViewModel {
  public:
   PanelBrowserFrameView(BrowserFrame* frame, PanelBrowserView* browser_view);
   virtual ~PanelBrowserFrameView();
 
   void UpdateTitleBar();
   void OnActivationChanged(bool active);
 
  protected:
   // Overridden from BrowserNonClientFrameView:
@@ skipping 23 matching lines @@
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const views::Event& event)
       OVERRIDE;
 
   // Overridden from views::ViewMenuDelegate:
   virtual void RunMenu(View* source, const gfx::Point& pt) OVERRIDE;
 
+  // Overridden from ui::SimpleMenuModel::Delegate:
+  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool GetAcceleratorForCommandId(
+      int command_id, ui::Accelerator* accelerator) OVERRIDE;
+  virtual void ExecuteCommand(int command_id) OVERRIDE;
+
   // Overridden from TabIconView::TabIconViewModel:
   virtual bool ShouldTabIconViewAnimate() const OVERRIDE;
   virtual SkBitmap GetFaviconForTabIconView() OVERRIDE;
 
  private:
   friend class PanelBrowserViewTest;
   FRIEND_TEST_ALL_PREFIXES(PanelBrowserViewTest, CreatePanel);
+  FRIEND_TEST_ALL_PREFIXES(PanelBrowserViewTest, CreateOptionsMenu);
 
   enum PaintState {
     NOT_PAINTED,
     PAINT_AS_INACTIVE,
     PAINT_AS_ACTIVE
   };
 
+  static const int kMinimizeAllCommand = 0;

[jennb, 2011/05/10 22:38:44]

Could these commands be enums?

[jianli, 2011/05/10 23:46:58]

Done.

+  static const int kRestoreAllCommand = 1;
+  static const int kCloseAllCommand = 2;
+  static const int kAboutCommand = 3;
+
   // Returns the thickness of the entire nonclient left, right, and bottom
   // borders, including both the window frame and any client edge.
   int NonClientBorderThickness() const;
 
   // Returns the height of the entire nonclient top border, including the window
   // frame, any title area, and any connected client edge.
   int NonClientTopBorderHeight() const;
 
   // Update control styles to indicate if the title bar is active or not, i.e.
   // changing the font and color of title text.
   void UpdateControlStyles(PaintState paint_state);
 
   // Custom draw the frame.
   void PaintFrameBorder(gfx::Canvas* canvas);
   void PaintClientEdge(gfx::Canvas* canvas);
 
+  void CreateOptionsMenu();
+  void CreateOptionsMenuItems();
+
   // The frame that hosts this view. This is a weak reference such that frame_
   // will always be valid in the lifetime of this view.
   BrowserFrame* frame_;
 
   // The client view hosted within this non-client frame view that is
   // guaranteed to be freed before the client view.
   // (see comments about view hierarchies in non_client_view.h)
   PanelBrowserView* browser_view_;
 
   PaintState paint_state_;
   views::MenuButton* options_button_;
   views::ImageButton* close_button_;
   TabIconView* title_icon_;
   views::Label* title_label_;
   gfx::Rect client_view_bounds_;
   std::wstring accessible_name_;
+  scoped_ptr<views::Menu2> options_menu_;
+  scoped_ptr<ui::SimpleMenuModel> options_menu_contents_;
+
+  // The flag to indicate if menu items to manipulate all panels are enabled
+  // or not. This is true when we have more than one panel up.
+  bool option_menu_manipulate_all_enabled_;

[jennb, 2011/05/10 22:38:44]

Seems like this should be queried from the panel manager rather than state to be
tracked in every panel.  Same comment for the option_menu_restore_all_enabled_
var.

[jianli, 2011/05/10 23:46:58]

Removed. See my comment in other place.

+
+  // The flag to indicate if "Restore All" is enabled (vs. Minimize All). This
+  // is true when all panels are minimized.
+  bool option_menu_restore_all_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_