[SiteChip] Add the basic painting of the site chip button

chrome/browser/ui/views/toolbar/toolbar_view.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_TOOLBAR_TOOLBAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_
 
 #include <set>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_member.h"
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/view.h"
 
 class BackButton;
 class BrowserActionsContainer;
 class Browser;
 class HomeButton;
 class ReloadButton;
+class SiteChipView;
 class ToolbarButton;
 class WrenchMenu;
 class WrenchMenuModel;
 class WrenchToolbarButton;
 
 namespace views {
 class MenuListener;
 }
 
 // The Browser Window's toolbar.
@@ skipping 41 matching lines @@
   views::View* GetBookmarkBubbleAnchor();
 
   // Returns the view to which the Translate bubble should be anchored.
   views::View* GetTranslateBubbleAnchor();
 
   // Accessors...
   Browser* browser() const { return browser_; }
   BrowserActionsContainer* browser_actions() const { return browser_actions_; }
   ReloadButton* reload_button() const { return reload_; }
   LocationBarView* location_bar() const { return location_bar_; }
+  SiteChipView* site_chip() const { return site_chip_view_; }
   views::MenuButton* app_menu() const;
 
   // Overridden from AccessiblePaneView
   virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
   // Overridden from views::MenuButtonListener:
   virtual void OnMenuButtonClicked(views::View* source,
                                    const gfx::Point& point) OVERRIDE;
 
@@ skipping 48 matching lines @@
   virtual bool AcceleratorPressed(const ui::Accelerator& acc) OVERRIDE;
 
   // Whether the wrench/hotdogs menu is currently showing.
   bool IsWrenchMenuShowing() const;
 
   // Whether the toolbar view needs its background painted by the
   // BrowserNonClientFrameView.
   bool ShouldPaintBackground() const;
 
   enum {
+    // The apparent horizontal space around the site chip.

[Peter Kasting, 2013/12/03 23:04:52]

Based on my comments on the bug: we should nuke this and use kStandardSpacing
instead.  Using 2 instead of 3 here just looks strange.

[Greg Billock, 2013/12/04 00:33:34]

Done.

+    kSiteChipSpacing = 2,
+
     // The apparent horizontal space between most items, and the vertical
     // padding above and below them.
     kStandardSpacing = 3,
 
     // The top of the toolbar has an edge we have to skip over in addition to
     // the standard spacing.
     kVertSpacing = 5,
   };
 
  protected:
@@ skipping 43 matching lines @@
   void OnShowHomeButtonChanged();
 
   int content_shadow_height() const;
 
   // Controls
   BackButton* back_;
   ToolbarButton* forward_;
   ReloadButton* reload_;
   HomeButton* home_;
   LocationBarView* location_bar_;
+  SiteChipView* site_chip_view_;
   BrowserActionsContainer* browser_actions_;
   WrenchToolbarButton* app_menu_;
   Browser* browser_;
 
   // Controls whether or not a home button should be shown on the toolbar.
   BooleanPrefMember show_home_button_;
 
   // The display mode used when laying out the toolbar.
   DisplayMode display_mode_;
 
   // Wrench model and menu.
   // Note that the menu should be destroyed before the model it uses, so the
   // menu should be listed later.
   scoped_ptr<WrenchMenuModel> wrench_menu_model_;
   scoped_ptr<WrenchMenu> wrench_menu_;
 
   // A list of listeners to call when the menu opens.
   ObserverList<views::MenuListener> menu_listeners_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_VIEW_H_