More removal of GTK code.

chrome/browser/defaults.cc

 // 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.
 
 #include "chrome/browser/defaults.h"
 
 namespace browser_defaults {
 
 #if defined(USE_X11)
 #if defined(TOOLKIT_VIEWS)
@@ skipping 31 matching lines @@
 const bool kSizeTabButtonToTopOfTabStrip = false;
 
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 const bool kSyncAutoStarts = true;
 const bool kShowOtherBrowsersInAboutMemory = false;
 #else
 const bool kSyncAutoStarts = false;
 const bool kShowOtherBrowsersInAboutMemory = true;
 #endif
 
-#if defined(TOOLKIT_GTK)
-const bool kShowCancelButtonInTaskManager = true;
-#else
 const bool kShowCancelButtonInTaskManager = false;

[Lei Zhang, 2014/04/11 20:52:10]

This might be dead code, remove?

-#endif
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 const bool kScrollEventChangesTab = true;
 #else
 const bool kScrollEventChangesTab = false;
 #endif
 
 const ui::ResourceBundle::FontStyle kAssociatedNetworkFontStyle =
     ui::ResourceBundle::BoldFont;
 
 #if !defined(OS_ANDROID)
 const bool kPasswordEchoEnabled = false;
 #endif
 
 bool bookmarks_enabled = true;
 
 bool enable_help_app = true;
 
 }  // namespace browser_defaults