Cleanup: Remove some code that only exists under mutually exclusive #defines.

BUG=none
TEST=none

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

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

9 files changed, 23 insertions, 81 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index e13c48c..a7c3cac 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -473,33 +473,6 @@ OSStatus KeychainCallback(SecKeychainEvent keychain_event,
 }
 #endif
 
-#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-void RegisterTranslateableItems(void) {
-  struct {
-    const char* stock_id;
-    int resource_id;
-  } translations[] = {
-    { GTK_STOCK_COPY, IDS_COPY },
-    { GTK_STOCK_CUT, IDS_CUT },
-    { GTK_STOCK_PASTE, IDS_PASTE },
-    { GTK_STOCK_DELETE, IDS_DELETE },
-    { GTK_STOCK_SELECT_ALL, IDS_SELECT_ALL },
-    { NULL, -1 }
-  }, *trans;
-
-  for (trans = translations; trans->stock_id; trans++) {
-    GtkStockItem stock_item;
-    if (gtk_stock_lookup(trans->stock_id, &stock_item)) {
-      std::string trans_label = gfx::ConvertAcceleratorsFromWindowsStyle(
-          l10n_util::GetStringUTF8(trans->resource_id));
-      stock_item.label = g_strdup(trans_label.c_str());
-      gtk_stock_add(&stock_item, 1);
-      g_free(stock_item.label);
-    }
-  }
-}
-#endif  // defined(OS_CHROMEOS)
-
 void SetSocketReusePolicy(int warmest_socket_trial_group,
                           const int socket_policy[],
                           int num_groups) {
@@ -1263,11 +1236,6 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
 #endif  // defined(OS_WIN)
   }
 
-#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
-  // This needs to be called after the locale has been set.
-  RegisterTranslateableItems();
-#endif
-
   // On first run, we need to process the predictor preferences before the
   // browser's profile_manager object is created, but after ResourceBundle
   // is initialized.
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc
index e074366..d99e6b3 100644
--- a/chrome/browser/chrome_browser_main_posix.cc
+++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -26,7 +26,7 @@
 #include <asm/page.h>  // for PAGE_SIZE needed by PTHREAD_STACK_MIN
 #endif
 
-#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/printing/print_dialog_gtk.h"
 #endif
 
@@ -267,7 +267,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopStart() {
   action.sa_handler = SIGHUPHandler;
   CHECK(sigaction(SIGHUP, &action, NULL) == 0);
 
-#if defined(TOOLKIT_USES_GTK) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_USES_GTK)
   printing::PrintingContextGtk::SetCreatePrintDialogFunction(
       &PrintDialogGtk::CreatePrintDialog);
 #endif
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 2be9c42..7111744 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -6,24 +6,18 @@
 
 namespace browser_defaults {
 
-#if defined(USE_AURA) || defined(OS_CHROMEOS)
+#if defined(USE_AURA)
 const bool kOSSupportsOtherBrowsers = false;
 #else
 const bool kOSSupportsOtherBrowsers = true;
 #endif
 
-#if defined(OS_CHROMEOS) && !defined(USE_AURA) || defined(TOOLKIT_USES_GTK)
+#if defined(TOOLKIT_USES_GTK)
 const bool kShowCancelButtonInTaskManager = true;
 #else
 const bool kShowCancelButtonInTaskManager = false;
 #endif
 
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-const bool kShowHtmlTitleBarInTaskManager = true;
-#else
-const bool kShowHtmlTitleBarInTaskManager = false;
-#endif
-
 #if defined(OS_CHROMEOS)
 // Make the regular omnibox text two points larger than the nine-point font
 // used in the tab strip (11pt / 72pt/in * 96px/in = 14.667px).
@@ -56,9 +50,9 @@ const int kAutocompleteEditFontPixelSizeInPopup =
 const bool kCanToggleSystemTitleBar = false;
 #else
 const bool kCanToggleSystemTitleBar = true;
-#endif
+#endif  // defined(TOOLKIT_VIEWS)
 
-#endif
+#endif  // defined(OS_CHROMEOS)
 
 #if !defined(OS_CHROMEOS)
 
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 364220a..5dea377 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -68,10 +68,6 @@ extern const bool kAlwaysOpenIncognitoWindow;
 // Should the close button be shown in the Task Manager dialog?
 extern const bool kShowCancelButtonInTaskManager;
 
-// Should the title bar be shown by HTML in the Task Manager dialog?
-// It may be used when HTML dialog doesn't have its native title bar.
-extern const bool kShowHtmlTitleBarInTaskManager;
-
 // Preferred height of the bookmarks bar when shown on every page and
 // when shown only on the new tab page.
 extern const int kBookmarkBarHeight;
diff --git a/chrome/browser/resources/task_manager/main.html b/chrome/browser/resources/task_manager/main.html
index 8d9a0a4..fc22005 100644
--- a/chrome/browser/resources/task_manager/main.html
+++ b/chrome/browser/resources/task_manager/main.html
@@ -24,9 +24,6 @@
     <link rel="stylesheet" href="task_manager.css">
   </head>
   <body>
-    <if expr="pp_ifdef('chromeos')">
-      <div class="dialog-title" id="dialog-title" i18n-content="title"></div>
-    </if>
     <div class="dialog-body">
       <div class="list-container">
         <div class="detail-table"></div>
diff --git a/chrome/browser/resources/task_manager/main.js b/chrome/browser/resources/task_manager/main.js
index e414443..a02f549 100644
--- a/chrome/browser/resources/task_manager/main.js
+++ b/chrome/browser/resources/task_manager/main.js
@@ -158,11 +158,9 @@ TaskManager.prototype = {
    */
   initElements_: function() {
     // <if expr="pp_ifdef('chromeos')">
-    // The elements 'dialog-title' and 'close-window' exist only on ChromeOS.
+    // The 'close-window' element exists only on ChromeOS.
     // This <if ... /if> section is removed while flattening HTML if chrome is
     // built as Desktop Chrome.
-    if (!this.opt_['isShowTitle'])
-      $('dialog-title').style.display = 'none';
     if (!this.opt_['isShowCloseButton'])
       $('close-window').style.display = 'none';
     $('close-window').addEventListener('click', this.close.bind(this));
@@ -677,7 +675,6 @@ taskmanager = TaskManager.getInstance();
 function init() {
   var params = parseQueryParams(window.location);
   var opt = {};
-  opt['isShowTitle'] = params.showtitle;
   opt['isBackgroundMode'] = params.background;
   opt['isShowCloseButton'] = params.showclose;
   taskmanager.initialize(document.body, opt);
diff --git a/chrome/browser/resources/task_manager/task_manager.css b/chrome/browser/resources/task_manager/task_manager.css
index e2e6d9c..e9e31dd 100644
--- a/chrome/browser/resources/task_manager/task_manager.css
+++ b/chrome/browser/resources/task_manager/task_manager.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 The Chromium Authors. All rights reserved.
+ * 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.
  */
@@ -26,17 +26,6 @@ body {
   width: 100%;
 }
 
-/* The top title of the dialog. */
-.dialog-title {
-  background-image: -webkit-linear-gradient(top, #fff,#f6f6f6);
-  border-bottom: 1px #d6d9e3 solid;
-  color: #42506c;
-  cursor: default;
-  font-size: 15px;
-  font-weight: bold;
-  padding: 0 12px 4px 12px;
-}
-
 /* Container for the detail list views. */
 .dialog-body {
   -webkit-box-flex: 1;
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc b/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc
index 23e0401..2a085f9 100644
--- a/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc
+++ b/chrome/browser/ui/webui/task_manager/task_manager_dialog.cc
@@ -4,6 +4,10 @@
 
 #include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
@@ -69,8 +73,6 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate {
     url_string += "?";
     if (browser_defaults::kShowCancelButtonInTaskManager)
       url_string += "showclose=1&";
-    if (browser_defaults::kShowHtmlTitleBarInTaskManager)
-      url_string += "showtitle=1&";
     if (is_background_page_mode_)
       url_string += "background=1";
     return GURL(url_string);
@@ -120,16 +122,16 @@ class TaskManagerDialogImpl : public HtmlDialogUIDelegate {
   }
 #if !defined(TOOLKIT_VIEWS)
   virtual void StoreDialogSize(const gfx::Size& dialog_size) OVERRIDE {
-   // Store the dialog's bounds so that it can be restored with the same bounds
-   // the next time it's opened.
-   if (g_browser_process->local_state()) {
-     DictionaryPrefUpdate update(g_browser_process->local_state(),
-                                 prefs::kTaskManagerWindowPlacement);
-     DictionaryValue* placement_pref = update.Get();
-     placement_pref->SetInteger("width", dialog_size.width());
-     placement_pref->SetInteger("height", dialog_size.height());
-   }
- }
+    // Store the dialog's bounds so that it can be restored with the same bounds
+    // the next time it's opened.
+    if (g_browser_process->local_state()) {
+      DictionaryPrefUpdate update(g_browser_process->local_state(),
+                                  prefs::kTaskManagerWindowPlacement);
+      DictionaryValue* placement_pref = update.Get();
+      placement_pref->SetInteger("width", dialog_size.width());
+      placement_pref->SetInteger("height", dialog_size.height());
+    }
+  }
 #endif
 
  private:
diff --git a/chrome/browser/ui/webui/task_manager/task_manager_ui.cc b/chrome/browser/ui/webui/task_manager/task_manager_ui.cc
index e5405dd..df23d8a 100644
--- a/chrome/browser/ui/webui/task_manager/task_manager_ui.cc
+++ b/chrome/browser/ui/webui/task_manager/task_manager_ui.cc
@@ -29,7 +29,6 @@ ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() {
       new ChromeWebUIDataSource(chrome::kChromeUITaskManagerHost);
 
   source->AddLocalizedString("closeWindow", IDS_CLOSE);
-  source->AddLocalizedString("title",IDS_TASK_MANAGER_TITLE);
   source->AddLocalizedString("aboutMemoryLink",
                              IDS_TASK_MANAGER_ABOUT_MEMORY_LINK);
   source->AddLocalizedString("killChromeOS", IDS_TASK_MANAGER_KILL_CHROMEOS);
@@ -54,7 +53,7 @@ ChromeWebUIDataSource* CreateTaskManagerUIHTMLSource() {
                              IDS_TASK_MANAGER_WEBCORE_SCRIPTS_CACHE_COLUMN);
   source->AddLocalizedString("webcoreCSSCacheColumn",
                              IDS_TASK_MANAGER_WEBCORE_CSS_CACHE_COLUMN);
-  source->AddLocalizedString("fpsColumn",IDS_TASK_MANAGER_FPS_COLUMN);
+  source->AddLocalizedString("fpsColumn", IDS_TASK_MANAGER_FPS_COLUMN);
   source->AddLocalizedString("sqliteMemoryUsedColumn",
                              IDS_TASK_MANAGER_SQLITE_MEMORY_USED_COLUMN);
   source->AddLocalizedString(