Move around more vector icons.

chrome/browser/ui/views/location_bar/bubble_icon_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_LOCATION_BAR_BUBBLE_ICON_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "ui/gfx/image/image_skia.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/animation/ink_drop_host_view.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/widget/widget_observer.h"
 
 class CommandUpdater;
 
 namespace gfx {
-enum class VectorIconId;
+struct VectorIcon;
 }
 
 namespace views {
 class BubbleDialogDelegateView;
 }
 
 // Represents an icon on the omnibox that shows a bubble when clicked.
 class BubbleIconView : public views::InkDropHostView,
                        public views::WidgetObserver {
+ public:
+  void Init();
+
  protected:
   enum ExecuteSource {
     EXECUTE_SOURCE_MOUSE,
     EXECUTE_SOURCE_KEYBOARD,
     EXECUTE_SOURCE_GESTURE,
   };
 
   BubbleIconView(CommandUpdater* command_updater, int command_id);
   ~BubbleIconView() override;
 
@@ skipping 42 matching lines @@
   void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
 
  protected:
   // Calls OnExecuting and runs |command_id_| with a valid |command_updater_|.
   virtual void ExecuteCommand(ExecuteSource source);
 
   // Returns the bubble instance for the icon.
   virtual views::BubbleDialogDelegateView* GetBubble() const = 0;
 
   // Gets the given vector icon in the correct color and size based on |active|.
-  virtual gfx::VectorIconId GetVectorIcon() const;
+  virtual const gfx::VectorIcon& GetVectorIcon() const = 0;
 
   // views::View:
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
 
   // Updates the icon after some state has changed.
   void UpdateIcon();
 
   // Sets the active state of the icon. An active icon will be displayed in a
   // "call to action" color.
   void SetActiveInternal(bool active);
@@ skipping 17 matching lines @@
 
   // This is used to check if the bookmark bubble was showing during the mouse
   // pressed event. If this is true then the mouse released event is ignored to
   // prevent the bubble from reshowing.
   bool suppress_mouse_released_action_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleIconView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_BUBBLE_ICON_VIEW_H_