Add touchpad sensitivity setting.

chrome/browser/chromeos/settings_contents_view.cc

 // Copyright (c) 2009 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/chromeos/settings_contents_view.h"
 
 #include <map>
 #include <vector>
 
 #include "app/combobox_model.h"
@@ skipping 363 matching lines @@
   virtual void NotifyPrefChanged(const std::wstring* pref_name);
 
  private:
   // The View that contains the contents of the section.
   views::View* contents_;
 
   // Controls for this section:
   views::Checkbox* enable_tap_to_click_checkbox_;
   views::Checkbox* enable_vert_edge_scroll_checkbox_;
   views::Slider* speed_factor_slider_;
+  views::Slider* sensitivity_slider_;
 
   // Preferences for this section:
   BooleanPrefMember tap_to_click_enabled_;
   BooleanPrefMember vert_edge_scroll_enabled_;
-  RealPrefMember speed_factor_;
+  IntegerPrefMember speed_factor_;
+  IntegerPrefMember sensitivity_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchpadSection);
 };
 
 TouchpadSection::TouchpadSection(Profile* profile)
     : OptionsPageView(profile),
       contents_(NULL),
       enable_tap_to_click_checkbox_(NULL),
       enable_vert_edge_scroll_checkbox_(NULL),
-      speed_factor_slider_(NULL) {
+      speed_factor_slider_(NULL),
+      sensitivity_slider_(NULL) {
 }
 
 void TouchpadSection::ButtonPressed(
     views::Button* sender, const views::Event& event) {
   if (sender == enable_tap_to_click_checkbox_) {
     bool enabled = enable_tap_to_click_checkbox_->checked();
     UserMetricsRecordAction(enabled ?
                                 L"Options_TapToClickCheckbox_Enable" :
                                 L"Options_TapToClickCheckbox_Disable",
                             profile()->GetPrefs());
     tap_to_click_enabled_.SetValue(enabled);
   } else if (sender == enable_vert_edge_scroll_checkbox_) {
     bool enabled = enable_vert_edge_scroll_checkbox_->checked();
     UserMetricsRecordAction(enabled ?
                                 L"Options_VertEdgeScrollCheckbox_Enable" :
                                 L"Options_VertEdgeScrollCheckbox_Disable",
                             profile()->GetPrefs());
     vert_edge_scroll_enabled_.SetValue(enabled);
   }
 }
 
 void TouchpadSection::SliderValueChanged(views::Slider* sender) {
   if (sender == speed_factor_slider_) {
     double value = speed_factor_slider_->value();
     UserMetricsRecordAction(L"Options_SpeedFactorSlider_Changed",
                             profile()->GetPrefs());
     speed_factor_.SetValue(value);
+  } else if (sender == sensitivity_slider_) {
+    double value = sensitivity_slider_->value();
+    UserMetricsRecordAction(L"Options_SensitivitySlider_Changed",
+                            profile()->GetPrefs());
+    sensitivity_.SetValue(value);
   }
 }
 
 void TouchpadSection::InitControlLayout() {
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
   int single_column_layout_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_layout_id);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
@@ skipping 24 matching lines @@
   contents_->SetLayoutManager(layout);
 
   enable_tap_to_click_checkbox_ = new views::Checkbox(l10n_util::GetString(
       IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION));
   enable_tap_to_click_checkbox_->set_listener(this);
   enable_tap_to_click_checkbox_->SetMultiLine(true);
   enable_vert_edge_scroll_checkbox_ = new views::Checkbox(l10n_util::GetString(
       IDS_OPTIONS_SETTINGS_VERT_EDGE_SCROLL_ENABLED_DESCRIPTION));
   enable_vert_edge_scroll_checkbox_->set_listener(this);
   enable_vert_edge_scroll_checkbox_->SetMultiLine(true);
-  // Create speed factor slider with values between 0.1 and 1.0 step 0.1
-  speed_factor_slider_ = new views::Slider(0.1, 1.0, 0.1,
+  // Create speed factor slider with values between 1 and 10 step 1
+  speed_factor_slider_ = new views::Slider(1, 10, 1,
       static_cast<views::Slider::StyleFlags>(
           views::Slider::STYLE_DRAW_VALUE |
-          views::Slider::STYLE_ONE_DIGIT |
+          views::Slider::STYLE_UPDATE_ON_RELEASE),
+      this);
+  // Create sensitivity slider with values between 1 and 10 step 1
+  sensitivity_slider_ = new views::Slider(1, 10, 1,
+      static_cast<views::Slider::StyleFlags>(
+          views::Slider::STYLE_DRAW_VALUE |
           views::Slider::STYLE_UPDATE_ON_RELEASE),
       this);
 
   int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   int double_column_view_set_id = 1;
   column_set = layout->AddColumnSet(double_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, double_column_view_set_id);
   layout->AddView(new views::Label(
+      l10n_util::GetString(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION)));
+  layout->AddView(sensitivity_slider_);
+  layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
+  layout->StartRow(0, double_column_view_set_id);
+  layout->AddView(new views::Label(
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_SPEED_FACTOR_DESCRIPTION)));
   layout->AddView(speed_factor_slider_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(enable_tap_to_click_checkbox_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(enable_vert_edge_scroll_checkbox_);
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   // Init member prefs so we can update the controls if prefs change.
   tap_to_click_enabled_.Init(prefs::kTapToClickEnabled,
                              profile()->GetPrefs(), this);
   vert_edge_scroll_enabled_.Init(prefs::kVertEdgeScrollEnabled,
                                  profile()->GetPrefs(), this);
   speed_factor_.Init(prefs::kTouchpadSpeedFactor,
                      profile()->GetPrefs(), this);
+  sensitivity_.Init(prefs::kTouchpadSensitivity,
+                    profile()->GetPrefs(), this);
 }
 
 void TouchpadSection::NotifyPrefChanged(const std::wstring* pref_name) {
   if (!pref_name || *pref_name == prefs::kTapToClickEnabled) {
     bool enabled =  tap_to_click_enabled_.GetValue();
     enable_tap_to_click_checkbox_->SetChecked(enabled);
   }
   if (!pref_name || *pref_name == prefs::kVertEdgeScrollEnabled) {
     bool enabled =  vert_edge_scroll_enabled_.GetValue();
     enable_vert_edge_scroll_checkbox_->SetChecked(enabled);
   }
   if (!pref_name || *pref_name == prefs::kTouchpadSpeedFactor) {
     double value =  speed_factor_.GetValue();
     speed_factor_slider_->SetValue(value);
   }
+  if (!pref_name || *pref_name == prefs::kTouchpadSensitivity) {
+    double value =  sensitivity_.GetValue();
+    sensitivity_slider_->SetValue(value);
+  }
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // SettingsContentsView
 
 ////////////////////////////////////////////////////////////////////////////////
 // SettingsContentsView, OptionsPageView implementation:
 
 void SettingsContentsView::InitControlLayout() {
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
   int single_column_view_set_id = 0;
   ColumnSet* column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new NetworkSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new TouchpadSection(profile()));
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 }