diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 20:16:18 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-17 20:16:18 +0000 |
| commit | 2d481774a178956f99423f923bd3de3893563280 (patch) | |
| tree | 6d1c93c56627c6ce8d168389a26234ba60ee004a /chrome/renderer/chrome_render_view_observer.cc | |
| parent | 53ad03d3e257a8cbf08d98f955b6ca32118f99ac (diff) | |
| download | chromium_src-2d481774a178956f99423f923bd3de3893563280.zip chromium_src-2d481774a178956f99423f923bd3de3893563280.tar.gz chromium_src-2d481774a178956f99423f923bd3de3893563280.tar.bz2 | |
Consolidate dialog style flags and strings; etc.
Nix kEnableChromeStyleDialogs and kAuraGoogleDialogFrames.
Replace with new ui/base switch kEnableNewDialogStyle.
Consolidate strings, nix helper function, cleanup switches.
Copy flag to renderer processes in RenderProcessHostImpl.
Remove duplicate kEnableTouchDragDrop flag copy code.
Replace ModalBackgroundView with a View and SolidBackground.
BUG=166075
TEST=--enable-new-dialog-style replaces --enable-chrome-style-dialogs and --aura-google-dialog-frames
R=sky@chromium.org,wittman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11565019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173521 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/chrome_render_view_observer.cc')
| -rw-r--r-- | chrome/renderer/chrome_render_view_observer.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/renderer/chrome_render_view_observer.cc b/chrome/renderer/chrome_render_view_observer.cc index 2c52886..2cc9ad0 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; |