Integrate Chrome To Mobile with Action Box UI.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

 // Copyright (c) 2012 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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/api/prefs/pref_member.h"
-#include "chrome/browser/command_observer.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings_types.h"
 
 @class AutocompleteTextField;
-class ChromeToMobileDecoration;
 class CommandUpdater;
 class ContentSettingDecoration;
 class EVBubbleDecoration;
 class KeywordHintDecoration;
 class LocationBarDecoration;
 class LocationIconDecoration;
 class PageActionDecoration;
 class PlusDecoration;
 class Profile;
 class SelectedKeywordDecoration;
 class StarDecoration;
 class ToolbarModel;
 class ZoomDecoration;
 
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an OmniboxViewMac instance to
 // the location bar text field, which handles most of the work.
 
 class LocationBarViewMac : public LocationBar,
                            public LocationBarTesting,
                            public OmniboxEditController,
-                           public content::NotificationObserver,
-                           public CommandObserver {
+                           public content::NotificationObserver {
  public:
   LocationBarViewMac(AutocompleteTextField* field,
                      CommandUpdater* command_updater,
                      ToolbarModel* toolbar_model,
                      Profile* profile,
                      Browser* browser);
   virtual ~LocationBarViewMac();
 
   // Overridden from LocationBar:
   virtual void ShowFirstRunBubble() OVERRIDE;
@@ skipping 22 matching lines @@
   virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE;
   virtual void TestPageActionPressed(size_t index) OVERRIDE;
 
   // Set/Get the editable state of the field.
   void SetEditable(bool editable);
   bool IsEditable();
 
   // Set the starred state of the bookmark star.
   void SetStarred(bool starred);
 
-  // Set ChromeToMobileDecoration's lit state (to update the icon).
-  void SetChromeToMobileDecorationLit(bool lit);
+  // Set the icon image resource for the action box plus decoration.
+  void SetActionBoxIcon(int image_id);

[sail, 2012/08/29 22:29:51]

would it make sense to add this to the base LocationBar class?

[msw, 2012/08/29 23:11:57]

LocationBar is just a pure virtual interface and Views/GTK don't do this the
same way / at all (at the moment), so I'll leave it as-is for now.

 
   // Happens when the zoom changes for the active tab. |can_show_bubble| is
   // false when the change in zoom for the active tab wasn't an explicit user
   // action (e.g. switching tabs, creating a new tab, creating a new browser).
   // Additionally, |can_show_bubble| will only be true when the bubble wouldn't
   // be obscured by other UI (wrench menu) or redundant (+/- from wrench).
   void ZoomChangedForActiveTab(bool can_show_bubble);
 
   // Get the point in window coordinates on the star for the bookmark bubble to
   // aim at.
   NSPoint GetBookmarkBubblePoint() const;
 
   // Get the point in window coordinates on the Action Box icon for
   // anchoring its bubbles.
   NSPoint GetActionBoxAnchorPoint() const;
 
-  // Get the point in window coordinates on the Chrome To Mobile icon for
-  // anchoring its bubble.
-  NSPoint GetChromeToMobileBubblePoint() const;
-
   // Get the point in window coordinates in the security icon at which the page
   // info bubble aims.
   NSPoint GetPageInfoBubblePoint() const;
 
   // When any image decorations change, call this to ensure everything is
   // redrawn and laid out if necessary.
   void OnDecorationsChanged();
 
   // Updates the location bar.  Resets the bar's permanent text and
   // security style, and if |should_restore_state| is true, restores
@@ skipping 51 matching lines @@
   NSImage* GetKeywordImage(const string16& keyword);
 
   AutocompleteTextField* GetAutocompleteTextField() { return field_; }
 
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // CommandObserver:
-  virtual void EnabledStateChangedForCommand(int id, bool enabled) OVERRIDE;
-
  private:
   // Posts |notification| to the default notification center.
   void PostNotification(NSString* notification);
 
   // Return the decoration for |page_action|.
   PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action);
 
   // Clear the page-action decorations.
   void DeletePageActionDecorations();
 
   // Re-generate the page-action decorations from the profile's
   // extension service.
   void RefreshPageActionDecorations();
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
   bool RefreshContentSettingsDecorations();
 
   void ShowFirstRunBubbleInternal();
 
   // Checks if the bookmark star should be enabled or not.
   bool IsStarEnabled();
 
-  // Update the Chrome To Mobile page action visibility and command state.
+  // Update the Chrome To Mobile page action command state.
   void UpdateChromeToMobileEnabled();
 
   // Updates the zoom decoration in the omnibox with the current zoom level.
   void UpdateZoomDecoration();
 
   // Ensures the star decoration is visible or hidden, as required.
   void UpdateStarDecorationVisibility();
 
   scoped_ptr<OmniboxViewMac> omnibox_view_;
 
@@ skipping 18 matching lines @@
   // A decoration that shows a lock icon and ev-cert label in a bubble
   // on the left.
   scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_;
 
   // Action "plus" button right of bookmark star.
   scoped_ptr<PlusDecoration> plus_decoration_;
 
   // Bookmark star right of page actions.
   scoped_ptr<StarDecoration> star_decoration_;
 
-  // Chrome To Mobile page action icon.
-  scoped_ptr<ChromeToMobileDecoration> chrome_to_mobile_decoration_;
-
   // A zoom icon at the end of the omnibox, which shows at non-standard zoom
   // levels.
   scoped_ptr<ZoomDecoration> zoom_decoration_;
 
   // The installed page actions.
   std::vector<ExtensionAction*> page_actions_;
 
   // Decorations for the installed Page Actions.
   ScopedVector<PageActionDecoration> page_action_decorations_;
 
@@ skipping 18 matching lines @@
   // Used to schedule a task for the first run info bubble.
   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_