Consolidate dialog style flags and strings; etc.

chrome/renderer/chrome_render_view_observer.cc

Index: chrome/renderer/chrome_render_view_observer.cc
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc
index 2c52886acc71e9107cb1d794732a8b2773c9355b..2cc9ad05b568d8f2be5106a82eeef74b7c3398c5 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -43,6 +43,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/ui_base_switches.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skbitmap_operations.h"
@@ -307,14 +308,14 @@ void ChromeRenderViewObserver::OnSetClientSidePhishingDetection(
 }
 
 void ChromeRenderViewObserver::OnSetVisuallyDeemphasized(bool deemphasized) {
-  // TODO(wittman): Remove this function entirely once new style constrained
+  // TODO(msw|wittman): Remove this function entirely once new style constrained
   // window is enabled on the other platforms.
 #if defined(OS_MACOSX) || defined(OS_WIN)
   return;
 #endif
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableChromeStyleDialogs)) {
+          switches::kEnableNewDialogStyle)) {
     bool already_deemphasized = !!dimmed_color_overlay_.get();
     if (already_deemphasized == deemphasized)
       return;