[SiteChip] Draw site chip icon and site title. Drag support.

chrome/browser/ui/views/toolbar/site_chip_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_SITE_CHIP_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_SITE_CHIP_VIEW_H_
 
+#include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_button.h"
 #include "ui/views/controls/button/button.h"
+#include "ui/views/drag_controller.h"
 
+class SiteChipExtensionIcon;
 class ToolbarView;
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 class Button;
 class Label;
 }
 
 class SiteChipView : public ToolbarButton,
-                     public views::ButtonListener {
+                     public views::ButtonListener,
+                     public views::DragController {
  public:
   explicit SiteChipView(ToolbarView* toolbar_view);
   virtual ~SiteChipView();
 
   void Init();
 
   // Returns true if the site chip experiment is enabled and thus the site chip
   // should be shown in the toolbar.
   bool ShouldShow();
 
   // Recalculates the contents of the Site Chip based on the displayed tab.
   void Update(content::WebContents* tab);
 
-  views::ImageView* location_icon_view() { return location_icon_view_; }
+  void OnChanged();
+
+  views::ImageView* location_icon_view() {
+    return location_icon_view_;
+  }
+  const views::ImageView* location_icon_view() const {
+    return location_icon_view_;
+  }
 
   // ToolbarButton:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
+  // views::DragController::
+  virtual void WriteDragDataForView(View* sender,
+                                    const gfx::Point& press_pt,
+                                    OSExchangeData* data) OVERRIDE;
+  virtual int GetDragOperationsForView(View* sender,
+                                       const gfx::Point& p) OVERRIDE;
+  virtual bool CanStartDragForView(View* sender,
+                                   const gfx::Point& press_pt,
+                                   const gfx::Point& p) OVERRIDE;
+
  private:
   ToolbarView* toolbar_view_;
   views::Label* host_label_;
   LocationIconView* location_icon_view_;
   scoped_ptr<views::Painter> background_painter_;
 

[Peter Kasting, 2013/12/06 02:16:52]

Nit: Understanding the logic behind where newlines are placed in here eludes me.
 Remove them all or else add useful comments about each separated group.

[Greg Billock, 2013/12/06 19:54:26]

First para is the views machinery. Second is layout state. Third is internal
machinery. Fourth is display state. But I agree this is subtle and just
collapsed it all.

+  bool showing_16x16_icon_;
+
+  scoped_ptr<SiteChipExtensionIcon> extension_icon_loader_;
+
+  GURL url_displayed_;
+  string16 host_;
+  ToolbarModel::SecurityLevel security_level_;
+
   DISALLOW_COPY_AND_ASSIGN(SiteChipView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_SITE_CHIP_VIEW_H_