Remove Gears from Chrome

chrome/browser/ui/views/options/advanced_contents_view.cc

Index: chrome/browser/ui/views/options/advanced_contents_view.cc
diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc
index 96ced9864f7ede625a105cf3042f0465b09b3150..ee1fb94cc2ea584d1ac06358b7581ef031e22d03 100644
--- a/chrome/browser/ui/views/options/advanced_contents_view.cc
+++ b/chrome/browser/ui/views/options/advanced_contents_view.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/gears_integration.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
@@ -231,12 +230,6 @@ class AdvancedSection : public OptionsPageView {
                            views::Label* label,
                            int id,
                            bool related_follows);
-  void AddLabeledTwoColumnRow(views::GridLayout* layout,
-                              views::Label* label,
-                              views::View* control,
-                              bool control_stretches,
-                              int id,
-                              bool related_follows);
   void AddTwoColumnRow(views::GridLayout* layout,
                        views::View* first,
                        views::View* second,
@@ -344,18 +337,6 @@ void AdvancedSection::AddWrappingLabelRow(views::GridLayout* layout,
   AddSpacing(layout, related_follows);
 }
 
-void AdvancedSection::AddLabeledTwoColumnRow(views::GridLayout* layout,
-                                             views::Label* label,
-                                             views::View* control,
-                                             bool control_stretches,
-                                             int id,
-                                             bool related_follows) {
-  label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  AddTwoColumnRow(layout, label, control, control_stretches, id,
-      related_follows ? views::kRelatedControlVerticalSpacing
-                      : views::kUnrelatedControlVerticalSpacing);
-}
-
 void AdvancedSection::AddTwoColumnRow(views::GridLayout* layout,
                                       views::View* first,
                                       views::View* second,
@@ -692,8 +673,6 @@ class WebContentSection : public AdvancedSection,
   // Controls for this section:
   views::Label* fonts_and_languages_label_;
   views::NativeButton* change_content_fonts_button_;
-  views::Label* gears_label_;
-  views::NativeButton* gears_settings_button_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentSection);
 };
@@ -701,18 +680,13 @@ class WebContentSection : public AdvancedSection,
 WebContentSection::WebContentSection(Profile* profile)
     : fonts_and_languages_label_(NULL),
       change_content_fonts_button_(NULL),
-      gears_label_(NULL),
-      gears_settings_button_(NULL),
       AdvancedSection(profile, UTF16ToWide(l10n_util::GetStringUTF16(
           IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT))) {
 }
 
 void WebContentSection::ButtonPressed(
     views::Button* sender, const views::Event& event) {
-  if (sender == gears_settings_button_) {
-    UserMetricsRecordAction(UserMetricsAction("Options_GearsSettings"), NULL);
-    GearsSettingsPressed(GetAncestor(GetWidget()->GetNativeView(), GA_ROOT));
-  } else if (sender == change_content_fonts_button_) {
+  if (sender == change_content_fonts_button_) {
     views::Window::CreateChromeWindow(
         GetWindow()->GetNativeWindow(),
         gfx::Rect(),
@@ -723,22 +697,6 @@ void WebContentSection::ButtonPressed(
 void WebContentSection::InitControlLayout() {
   AdvancedSection::InitControlLayout();
 
-  if (!base::i18n::IsRTL()) {
-    gears_label_ = new views::Label(UTF16ToWide(
-        l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)));
-  } else {
-    // Add an RTL mark so that
-    // ":" in "Google Gears:" in Hebrew Chrome is displayed left-most.
-    std::wstring gearssetting_group_name = UTF16ToWide(
-        l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME));
-    gearssetting_group_name.push_back(
-        static_cast<wchar_t>(base::i18n::kRightToLeftMark));
-    gears_label_ = new views::Label(gearssetting_group_name);
-  }
-  gears_settings_button_ = new views::NativeButton(
-      this,
-      UTF16ToWide(l10n_util::GetStringUTF16(
-          IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON)));
   fonts_and_languages_label_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_OPTIONS_FONTSETTINGS_INFO)));
 
@@ -764,10 +722,6 @@ void WebContentSection::InitControlLayout() {
   AddLeadingControl(layout, change_content_fonts_button_,
                     indented_column_set_id,
                     false);
-
-  // Gears.
-  AddLabeledTwoColumnRow(layout, gears_label_, gears_settings_button_, false,
-                         single_double_column_set, false);
 }
 
 ////////////////////////////////////////////////////////////////////////////////