Integrate Chrome To Mobile with Action Box UI.

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
-#import "chrome/browser/ui/cocoa/location_bar/chrome_to_mobile_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/plus_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/zoom_decoration.h"
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
@@ skipping 44 matching lines @@
       field_(field),
       disposition_(CURRENT_TAB),
       location_icon_decoration_(new LocationIconDecoration(this)),
       selected_keyword_decoration_(
           new SelectedKeywordDecoration(OmniboxViewMac::GetFieldFont())),
       ev_bubble_decoration_(
           new EVBubbleDecoration(location_icon_decoration_.get(),
                                  OmniboxViewMac::GetFieldFont())),
       plus_decoration_(NULL),
       star_decoration_(new StarDecoration(command_updater)),
-      chrome_to_mobile_decoration_(NULL),
       zoom_decoration_(new ZoomDecoration(toolbar_model)),
       keyword_hint_decoration_(
           new KeywordHintDecoration(OmniboxViewMac::GetFieldFont())),
       profile_(profile),
       browser_(browser),
       toolbar_model_(toolbar_model),
       transition_(content::PageTransitionFromInt(
           content::PAGE_TRANSITION_TYPED |
           content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
       weak_ptr_factory_(this) {
-  // Disable Chrome To Mobile for off-the-record and non-synced profiles,
-  // or if the feature is disabled by a command line flag or chrome://flags.
-  if (!profile_->IsOffTheRecord() && profile_->IsSyncAccessible() &&
-      ChromeToMobileService::IsChromeToMobileEnabled()) {
-    command_updater_->AddCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this);
-    chrome_to_mobile_decoration_.reset(
-        new ChromeToMobileDecoration(profile, command_updater));
-    UpdateChromeToMobileEnabled();
-  }
-
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox)) {
     plus_decoration_.reset(new PlusDecoration(this, command_updater, browser_));
   }
 
   for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     DCHECK_EQ(i, content_setting_decorations_.size());
     ContentSettingsType type = static_cast<ContentSettingsType>(i);
     content_setting_decorations_.push_back(
         new ContentSettingDecoration(type, this, profile_));
   }
@@ skipping 359 matching lines @@
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ setNeedsDisplay:YES];
 }
 
 void LocationBarViewMac::SetStarred(bool starred) {
   star_decoration_->SetStarred(starred);
   UpdateStarDecorationVisibility();
   OnDecorationsChanged();
 }
 
-void LocationBarViewMac::SetChromeToMobileDecorationLit(bool lit) {
-  chrome_to_mobile_decoration_->SetLit(lit);
+void LocationBarViewMac::SetActionBoxIcon(int image_id) {
+  plus_decoration_->SetImage(OmniboxViewMac::ImageForResource(image_id));
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::ZoomChangedForActiveTab(bool can_show_bubble) {
   UpdateZoomDecoration();
   OnDecorationsChanged();
 
   // TODO(dbeam): show a zoom bubble when |can_show_bubble| is true, the zoom
   // decoration is showing, and the wrench menu isn't showing.
 }
 
 NSPoint LocationBarViewMac::GetActionBoxAnchorPoint() const {
   NSPoint point = plus_decoration_->GetActionBoxAnchorPoint();
   return [field_ convertPoint:point toView:nil];
 }
 
 NSPoint LocationBarViewMac::GetBookmarkBubblePoint() const {
   AutocompleteTextFieldCell* cell = [field_ cell];
   const NSRect frame = [cell frameForDecoration:star_decoration_.get()
                                         inFrame:[field_ bounds]];
   const NSPoint point = star_decoration_->GetBubblePointInFrame(frame);
   return [field_ convertPoint:point toView:nil];
 }
 
-NSPoint LocationBarViewMac::GetChromeToMobileBubblePoint() const {
-  AutocompleteTextFieldCell* cell = [field_ cell];
-  const NSRect frame =
-      [cell frameForDecoration:chrome_to_mobile_decoration_.get()
-                       inFrame:[field_ bounds]];
-  const NSPoint point =
-      chrome_to_mobile_decoration_->GetBubblePointInFrame(frame);
-  return [field_ convertPoint:point toView:nil];
-}
-
 NSPoint LocationBarViewMac::GetPageInfoBubblePoint() const {
   AutocompleteTextFieldCell* cell = [field_ cell];
   if (ev_bubble_decoration_->IsVisible()) {
     const NSRect frame = [cell frameForDecoration:ev_bubble_decoration_.get()
                                           inFrame:[field_ bounds]];
     const NSPoint point = ev_bubble_decoration_->GetBubblePointInFrame(frame);
     return [field_ convertPoint:point toView:nil];
   } else {
     const NSRect frame =
         [cell frameForDecoration:location_icon_decoration_.get()
@@ skipping 42 matching lines @@
       UpdateChromeToMobileEnabled();
       OnChanged();
       break;
 
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
-void LocationBarViewMac::EnabledStateChangedForCommand(int id, bool enabled) {
-  DCHECK_EQ(id, IDC_CHROME_TO_MOBILE_PAGE);
-  UpdateChromeToMobileEnabled();
-  OnChanged();
-}
-
 void LocationBarViewMac::PostNotification(NSString* notification) {
   [[NSNotificationCenter defaultCenter] postNotificationName:notification
                                         object:[NSValue valueWithPointer:this]];
 }
 
 bool LocationBarViewMac::RefreshContentSettingsDecorations() {
   const bool input_in_progress = toolbar_model_->input_in_progress();
   WebContents* web_contents =
       input_in_progress ? NULL : chrome::GetActiveWebContents(browser_);
   bool icons_updated = false;
@@ skipping 57 matching lines @@
   // the constructor.  I am still wrestling with how best to deal with
   // right-hand decorations, which are not a static set.
   [cell clearDecorations];
   [cell addLeftDecoration:location_icon_decoration_.get()];
   [cell addLeftDecoration:selected_keyword_decoration_.get()];
   [cell addLeftDecoration:ev_bubble_decoration_.get()];
   if (plus_decoration_.get())
     [cell addRightDecoration:plus_decoration_.get()];
   [cell addRightDecoration:star_decoration_.get()];
   [cell addRightDecoration:zoom_decoration_.get()];
-  if (chrome_to_mobile_decoration_.get())
-    [cell addRightDecoration:chrome_to_mobile_decoration_.get()];
 
   // Note that display order is right to left.
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     [cell addRightDecoration:page_action_decorations_[i]];
   }
   for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {
     [cell addRightDecoration:content_setting_decorations_[i]];
   }
 
   [cell addRightDecoration:keyword_hint_decoration_.get()];
@@ skipping 50 matching lines @@
 }
 
 bool LocationBarViewMac::IsStarEnabled() {
   return [field_ isEditable] &&
          browser_defaults::bookmarks_enabled &&
          !toolbar_model_->input_in_progress() &&
          edit_bookmarks_enabled_.GetValue();
 }
 
 void LocationBarViewMac::UpdateChromeToMobileEnabled() {
-  if (!chrome_to_mobile_decoration_.get())
-    return;
-
-  DCHECK(ChromeToMobileService::IsChromeToMobileEnabled());
-  bool enabled = [field_ isEditable] && !toolbar_model_->input_in_progress() &&
+  bool enabled = ChromeToMobileService::IsChromeToMobileEnabled() &&
+      [field_ isEditable] && !toolbar_model_->input_in_progress() &&
       ChromeToMobileServiceFactory::GetForProfile(profile_)->HasMobiles();
-  chrome_to_mobile_decoration_->SetVisible(enabled);
   command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
 }
 
 void LocationBarViewMac::UpdateZoomDecoration() {
   TabContents* tab_contents = GetTabContents();
   if (!tab_contents)
     return;
 
   zoom_decoration_->Update(tab_contents->zoom_controller());
 }
 
 void LocationBarViewMac::UpdateStarDecorationVisibility() {
   bool action_box_enabled =
       CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox);
   // If the action box is enabled, only show the star if it's lit.
   bool visible = IsStarEnabled();
   if (!star_decoration_->starred() && action_box_enabled)
     visible = false;
   star_decoration_->SetVisible(visible);
 }