Integrate Chrome To Mobile with Action Box UI.

chrome/browser/ui/gtk/location_bar_view_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 372 matching lines @@
 // LocationBarViewGtk
 
 // static
 const GdkColor LocationBarViewGtk::kBackgroundColor =
     GDK_COLOR_RGB(255, 255, 255);
 
 LocationBarViewGtk::LocationBarViewGtk(Browser* browser)
     : zoom_image_(NULL),
       star_image_(NULL),
       starred_(false),
-      chrome_to_mobile_image_(NULL),
       site_type_alignment_(NULL),
       site_type_event_box_(NULL),
       location_icon_image_(NULL),
       drag_icon_(NULL),
       enable_location_drag_(false),
       security_info_label_(NULL),
       web_intents_button_view_(new WebIntentsButtonViewGtk(this)),
       tab_to_search_alignment_(NULL),
       tab_to_search_box_(NULL),
       tab_to_search_full_label_(NULL),
@@ skipping 15 matching lines @@
       hbox_width_(0),
       entry_box_width_(0),
       show_selected_keyword_(false),
       show_keyword_hint_(false) {
 }
 
 LocationBarViewGtk::~LocationBarViewGtk() {
   // All of our widgets should be children of / owned by the alignment.
   zoom_.Destroy();
   star_.Destroy();
-  chrome_to_mobile_view_.Destroy();
   hbox_.Destroy();
   content_setting_hbox_.Destroy();
   page_action_hbox_.Destroy();
   web_intents_hbox_.Destroy();
 }
 
 void LocationBarViewGtk::Init(bool popup_window_mode) {
   popup_window_mode_ = popup_window_mode;
 
   Profile* profile = browser_->profile();
@@ skipping 113 matching lines @@
     const int kMagicActionBoxYOffset = 3;
     GtkWidget* alignment = gtk_alignment_new(0, 0, 1, 1);
     gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
                               0, kMagicActionBoxYOffset,
                               0, kInnerPadding);
     gtk_container_add(GTK_CONTAINER(alignment), action_box_button_->widget());
 
     gtk_box_pack_end(GTK_BOX(hbox_.get()), alignment,
                      FALSE, FALSE, 0);
   } else if (browser_defaults::bookmarks_enabled && !ShouldOnlyShowLocation()) {
-    // Hide the star and Chrome To Mobile icons in popups, app windows, etc.
+    // Hide the star icon in popups, app windows, etc.
     CreateStarButton();
     gtk_box_pack_end(GTK_BOX(hbox_.get()), star_.get(), FALSE, FALSE, 0);
-
-    // 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()) {
-      CreateChromeToMobileButton();
-      gtk_box_pack_end(GTK_BOX(hbox_.get()), chrome_to_mobile_view_.get(),
-                       FALSE, FALSE, 0);
-      command_updater_->AddCommandObserver(IDC_CHROME_TO_MOBILE_PAGE, this);
-      UpdateChromeToMobileIcon();
-    }
   }
 
   CreateZoomButton();
   gtk_box_pack_end(GTK_BOX(hbox_.get()), zoom_.get(), FALSE, FALSE, 0);
 
   content_setting_hbox_.Own(gtk_hbox_new(FALSE, kInnerPadding + 1));
   gtk_widget_set_name(content_setting_hbox_.get(),
                       "chrome-content-setting-hbox");
   gtk_box_pack_end(GTK_BOX(hbox_.get()), content_setting_hbox_.get(),
                    FALSE, FALSE, 1);
@@ skipping 141 matching lines @@
        ++iter) {
     if ((*iter)->page_action() == page_action)
       return (*iter)->widget();
   }
   return NULL;
 }
 
 void LocationBarViewGtk::Update(const WebContents* contents) {
   UpdateZoomIcon();
   UpdateStarIcon();
-  UpdateChromeToMobileIcon();
   UpdateSiteTypeArea();
   UpdateContentSettingsIcons();
   UpdatePageActions();
   UpdateWebIntentsButton();
   location_entry_->Update(contents);
   // The security level (background color) could have changed, etc.
   if (theme_service_->UsingNativeTheme()) {
     // In GTK mode, we need our parent to redraw, as it draws the text entry
     // border.
     gtk_widget_queue_draw(gtk_widget_get_parent(widget()));
@@ skipping 102 matching lines @@
 }
 
 void LocationBarViewGtk::CreateStarButton() {
   star_.Own(CreateIconButton(&star_image_,
                              0,
                              VIEW_ID_STAR_BUTTON,
                              IDS_TOOLTIP_STAR,
                              OnStarButtonPressThunk));
 }
 
-void LocationBarViewGtk::CreateChromeToMobileButton() {
-  chrome_to_mobile_view_.Own(
-      CreateIconButton(&chrome_to_mobile_image_,
-                       IDR_MOBILE,
-                       VIEW_ID_CHROME_TO_MOBILE_BUTTON,
-                       IDS_CHROME_TO_MOBILE_BUBBLE_TOOLTIP,
-                       OnChromeToMobileButtonPressThunk));
-}
-
 void LocationBarViewGtk::OnInputInProgress(bool in_progress) {
   // This is identical to the Windows code, except that we don't proxy the call
   // back through the Toolbar, and just access the model here.
   // The edit should make sure we're only notified when something changes.
   DCHECK(toolbar_model_->input_in_progress() != in_progress);
 
   toolbar_model_->set_input_in_progress(in_progress);
   Update(NULL);
 }
 
@@ skipping 221 matching lines @@
           content::Details<TabContents>(details).ptr();
       if (target_tab == GetTabContents())
         UpdatePageActions();
       break;
     }
 
     case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* pref_name_in = content::Details<std::string>(details).ptr();
       DCHECK(pref_name_in);
 
-      if (*pref_name_in == prefs::kEditBookmarksEnabled) {
+      if (*pref_name_in == prefs::kEditBookmarksEnabled)
         UpdateStarIcon();
-        UpdateChromeToMobileIcon();
-      } else {
+      else
         NOTREACHED();
-      }
       break;
     }
 
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       if (theme_service_->UsingNativeTheme()) {
         gtk_widget_modify_bg(tab_to_search_box_, GTK_STATE_NORMAL, NULL);
 
         GdkColor border_color = theme_service_->GetGdkColor(
             ThemeService::COLOR_FRAME);
         gtk_util::SetRoundedWindowBorderColor(tab_to_search_box_, border_color);
@@ skipping 34 matching lines @@
                                   kBottomMargin + kBorderThickness,
                                   top_bottom, top_bottom);
         gtk_alignment_set_padding(GTK_ALIGNMENT(tab_to_search_alignment_),
                                   1, 1, 0, 0);
         gtk_alignment_set_padding(GTK_ALIGNMENT(site_type_alignment_),
                                   1, 1, 0, 0);
       }
 
       UpdateZoomIcon();
       UpdateStarIcon();
-      UpdateChromeToMobileIcon();
       UpdateSiteTypeArea();
       UpdateContentSettingsIcons();
       UpdateWebIntentsButton();
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
@@ skipping 305 matching lines @@
 
 gboolean LocationBarViewGtk::OnStarButtonPress(GtkWidget* widget,
                                                GdkEventButton* event) {
   if (event->button == 1) {
     chrome::ExecuteCommand(browser_, IDC_BOOKMARK_PAGE);
     return TRUE;
   }
   return FALSE;
 }
 
-gboolean LocationBarViewGtk::OnChromeToMobileButtonPress(
-    GtkWidget* widget,
-    GdkEventButton* event) {
-  if (event->button == 1) {
-    chrome::ExecuteCommand(browser_, IDC_CHROME_TO_MOBILE_PAGE);
-    return TRUE;
-  }
-  return FALSE;
-}
-
 void LocationBarViewGtk::ShowZoomBubble() {
   if (!zoom_.get() || toolbar_model_->input_in_progress())
     return;
 
   ZoomBubbleGtk::Show(zoom_.get(), GetTabContents(), true);
 }
 
 void LocationBarViewGtk::ShowStarBubble(const GURL& url,
                                         bool newly_bookmarked) {
   if (!star_.get())
     return;
 
   BookmarkBubbleGtk::Show(star_.get(), browser_->profile(), url,
                           newly_bookmarked);
 }
 
 void LocationBarViewGtk::ShowChromeToMobileBubble() {
-  ChromeToMobileBubbleGtk::Show(GTK_IMAGE(chrome_to_mobile_image_), browser_);
+  // TODO(msw): Chrome to Mobile is currently disabled on GTK.
+  // ChromeToMobileBubbleGtk::Show(GTK_WIDGET(action_box_button_->widget()),
+  //                               browser_);
 }
 
 void LocationBarViewGtk::SetStarred(bool starred) {
   if (starred == starred_)
     return;
 
   starred_ = starred;
   UpdateStarIcon();
 }
 
@@ skipping 38 matching lines @@
     gtk_widget_show_all(star_.get());
     int id = starred_ ? IDR_STAR_LIT : IDR_STAR;
     gtk_image_set_from_pixbuf(
         GTK_IMAGE(star_image_),
         theme_service_->GetImageNamed(id)->ToGdkPixbuf());
   } else {
     gtk_widget_hide_all(star_.get());
   }
 }
 
-void LocationBarViewGtk::UpdateChromeToMobileIcon() {
-  if (!chrome_to_mobile_view_.get())
-    return;
-
-  Profile* profile = browser_->profile();
-  bool enabled = !toolbar_model_->input_in_progress() &&
-      ChromeToMobileServiceFactory::GetForProfile(profile)->HasMobiles();
-  gtk_widget_set_visible(chrome_to_mobile_view_.get(), enabled);
-  command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
-}
-
 bool LocationBarViewGtk::ShouldOnlyShowLocation() {
   return !browser_->is_type_tabbed();
 }
 
 void LocationBarViewGtk::AdjustChildrenVisibility() {
   int text_width = location_entry_->TextWidth();
   int available_width = entry_box_width_ - text_width - kInnerPadding;
 
   // Only one of |tab_to_search_alignment_| and |tab_to_search_hint_| can be
   // visible at the same time.
@@ skipping 324 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_WINDOW_CLOSED);
   DisconnectPageActionAccelerator();
 }
 
-void LocationBarViewGtk::EnabledStateChangedForCommand(int id, bool enabled) {
-  DCHECK_EQ(id, IDC_CHROME_TO_MOBILE_PAGE);
-  if (enabled != gtk_widget_get_visible(chrome_to_mobile_view_.get()))
-    UpdateChromeToMobileIcon();
-}
-
 void LocationBarViewGtk::PageActionViewGtk::ConnectPageActionAccelerator() {
   const ExtensionSet* extensions = owner_->browser()->profile()->
       GetExtensionService()->extensions();
   const Extension* extension =
       extensions->GetByID(page_action_->extension_id());
   window_ = owner_->browser()->window()->GetNativeWindow();
 
   extensions::CommandService* command_service =
       extensions::CommandServiceFactory::GetForProfile(
           owner_->browser()->profile());
@@ skipping 180 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }