Remove Gears from Chrome

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

 // Copyright (c) 2011 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/views/options/advanced_contents_view.h"
 
 #include <windows.h>
 
 #include <cryptuiapi.h>
 #pragma comment(lib, "cryptui.lib")
 #include <shellapi.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_callback_factory.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #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"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/ui/options/options_util.h"
 #include "chrome/browser/ui/options/show_options_url.h"
@@ skipping 183 matching lines @@
   // Convenience helpers for adding controls to specific layouts in an
   // aesthetically pleasing way.
   void AddWrappingCheckboxRow(views::GridLayout* layout,
                               views::Checkbox* checkbox,
                               int id,
                               bool related_follows);
   void AddWrappingLabelRow(views::GridLayout* layout,
                            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,
                        bool control_stretches,  // Whether or not the control
                                                 // expands to fill the width.
                        int id,
                        int trailing_space);
   void AddLeadingControl(views::GridLayout* layout,
                          views::View* control,
                          int id,
@@ skipping 87 matching lines @@
                                           views::Label* label,
                                           int id,
                                           bool related_follows) {
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   layout->StartRow(0, id);
   layout->AddView(label);
   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,
                                       bool control_stretches,
                                       int id,
                                       int trailing_space) {
   layout->StartRow(0, id);
   layout->AddView(first);
   if (control_stretches) {
     layout->AddView(second);
@@ skipping 316 matching lines @@
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
  protected:
   // OptionsPageView overrides:
   virtual void InitControlLayout();
 
  private:
   // 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);
 };
 
 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(),
         new FontsLanguagesWindowView(profile()))->Show();
   }
 }
 
 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)));
 
   change_content_fonts_button_ = new views::NativeButton(
       this,
       UTF16ToWide(l10n_util::GetStringUTF16(
           IDS_OPTIONS_FONTSETTINGS_CONFIGUREFONTS_BUTTON)));
 
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
   const int single_column_view_set_id = 0;
   AddWrappingColumnSet(layout, single_column_view_set_id);
   const int indented_column_set_id = 1;
   AddIndentedColumnSet(layout, indented_column_set_id);
   const int single_double_column_set = 2;
   AddTwoColumnSet(layout, single_double_column_set);
 
   // Fonts and Languages.
   AddWrappingLabelRow(layout, fonts_and_languages_label_,
                       single_column_view_set_id,
                       true);
   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);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SecuritySection
 
 class SecuritySection : public AdvancedSection,
                         public views::ButtonListener {
  public:
   explicit SecuritySection(Profile* profile);
   virtual ~SecuritySection() {}
@@ skipping 861 matching lines @@
 // AdvancedScrollViewContainer, views::View overrides:
 
 void AdvancedScrollViewContainer::Layout() {
   gfx::Rect lb = GetLocalBounds();
 
   gfx::Size border = gfx::NativeTheme::instance()->GetThemeBorderSize(
       gfx::NativeTheme::LIST);
   lb.Inset(border.width(), border.height());
   scroll_view_->SetBoundsRect(lb);
 }