DevTools: remove DevTools from options UI.

Review URL: http://codereview.chromium.org/113951

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17073 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 86 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 388d46f..a317bad 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3527,11 +3527,6 @@ each locale. -->
         JavaScript Debugger - Running
       </message>
 
-      <!-- Developer Tools -->
-      <message name="IDS_DEVTOOLS_TITLE" desc="Default Developer Tools title bar">
-        Developer Tools - <ph name="URL">$1<ex>http://www.google.com</ex></ph>
-      </message>
-
       <!-- Shortcut Modifiers -->
       <message name="IDS_CONTROL_MODIFIER" desc="Control key shortcut modifier">
         Ctrl+<ph name="KEY_COMBO_NAME">$1<ex>C</ex></ph>
@@ -3673,10 +3668,6 @@ each locale. -->
         Don't reset
       </message>
       
-      <message name="IDS_OPTIONS_ENABLE_DEVTOOLS" desc="The label of the Enable Developer Tools checkbox in the 'Advanced options'">
-        Enable Developer Tools
-      </message>
-
       <!-- Can't write to user data directory dialog -->
       <message name="IDS_CANT_WRITE_USER_DIRECTORY_TITLE" desc="Title of dialog that is displayed when we can't create a directory for this user.">
         Failed To Create Data Directory
@@ -3720,9 +3711,6 @@ each locale. -->
       <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK">
         Network
       </message>
-      <message name="IDS_OPTIONS_ADVANCED_SECTION_TITLE_DEVTOOLS">
-        Developer Tools
-      </message>
 
       <!-- Script Timeout Dialog -->
       <message name="IDS_SCRIPT_TIMEOUT_DIALOG_TITLE" desc="Title of the script timeout dialog.">
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 1b6a0ef..97a917c 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -1043,78 +1043,6 @@ void NetworkSection::InitControlLayout() {
 void NetworkSection::NotifyPrefChanged(const std::wstring* pref_name) {
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// DevToolsSection
-
-class DevToolsSection : public AdvancedSection,
-                        public views::ButtonListener {
- public:
-  explicit DevToolsSection(Profile* profile);
-  virtual ~DevToolsSection() {}
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender);
-
- protected:
-  // OptionsPageView overrides:
-  virtual void InitControlLayout();
-  virtual void NotifyPrefChanged(const std::wstring* pref_name);
-
- private:
-  // Controls for this section:
-  views::Checkbox* enable_devtools_checkbox_;
-
-  // Preferences for this section:
-  BooleanPrefMember enable_devtools_;
-
-  DISALLOW_COPY_AND_ASSIGN(DevToolsSection);
-};
-
-DevToolsSection::DevToolsSection(Profile* profile)
-    : enable_devtools_checkbox_(NULL),
-      AdvancedSection(profile,
-          l10n_util::GetString(IDS_OPTIONS_ADVANCED_SECTION_TITLE_DEVTOOLS)) {
-}
-
-void DevToolsSection::ButtonPressed(views::Button* sender) {
-  if (sender == enable_devtools_checkbox_) {
-    bool enabled = enable_devtools_checkbox_->checked();
-    UserMetricsRecordAction(enabled ?
-                                L"Options_DevToolsCheckbox_Enable" :
-                                L"Options_DevToolsCheckbox_Disable",
-                            profile()->GetPrefs());
-    enable_devtools_.SetValue(enabled);
-  }
-}
-
-void DevToolsSection::InitControlLayout() {
-  AdvancedSection::InitControlLayout();
-
-  enable_devtools_checkbox_ = new views::Checkbox(
-      l10n_util::GetString(IDS_OPTIONS_ENABLE_DEVTOOLS));
-  enable_devtools_checkbox_->set_listener(this);
-
-  GridLayout* layout = new GridLayout(contents_);
-  contents_->SetLayoutManager(layout);
-
-  const int single_column_view_set_id = 0;
-  AddWrappingColumnSet(layout, single_column_view_set_id);
-
-  AddWrappingCheckboxRow(layout, enable_devtools_checkbox_,
-                         single_column_view_set_id, false);
-
-  // Init member prefs so we can update the controls if prefs change.
-  enable_devtools_.Init(prefs::kWebKitDeveloperExtrasEnabled,
-                        profile()->GetPrefs(), this);
-}
-
-void DevToolsSection::NotifyPrefChanged(const std::wstring* pref_name) {
-  if (!pref_name || *pref_name == prefs::kWebKitDeveloperExtrasEnabled) {
-    enable_devtools_checkbox_->SetChecked(
-        enable_devtools_.GetValue());
-  }
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1210,8 +1138,6 @@ void AdvancedContentsView::InitControlLayout() {
   layout->AddView(new WebContentSection(profile()));
   layout->StartRow(0, single_column_view_set_id);
   layout->AddView(new SecuritySection(profile()));
-  layout->StartRow(0, single_column_view_set_id);
-  layout->AddView(new DevToolsSection(profile()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////