Consolidate dialog style flags and strings; etc.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 5f09527b1ee93ad5937b4494e88f97843729c82d..d6301193a409411089e4bca9785a330debf6e2ea 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -519,9 +519,6 @@ const char kEnableExtensionActivityUI[]     = "enable-extension-activity-ui";
 // Enables or disables showing extensions in the action box.
 const char kExtensionsInActionBox[]         = "extensions-in-action-box";
 
-// Applies the chrome style to any dialog based on ConstrainedWindowViews.
-const char kEnableChromeStyleDialogs[]      = "enable-chrome-style-dialogs";
-
 // By default, cookies are not allowed on file://. They are needed for testing,
 // for example page cycler and layout tests. See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
@@ -1626,19 +1623,3 @@ const char kEnablePrintPreview[]            = "enable-print-preview";
 // -----------------------------------------------------------------------------
 
 }  // namespace switches
-
-namespace chrome {
-
-bool UseChromeStyleDialogs() {
-#if defined(OS_MACOSX)
-  return true;
-#elif defined(OS_WIN)
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableChromeStyleDialogs);
-#else
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableChromeStyleDialogs);
-#endif
-}
-
-}  // namespace chrome