Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4820)

Unified Diff: chrome/renderer/chrome_render_view_observer.cc

Issue 10855151: Gradient overlay for constrained window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix chromeos Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/renderer/webview_animating_overlay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f94d42a5e287805dde2998492ee6151eeef29dee..8277af961d5fd879d491ed20d543e233a0faf6fb 100644
--- a/chrome/renderer/chrome_render_view_observer.cc
+++ b/chrome/renderer/chrome_render_view_observer.cc
@@ -27,6 +27,7 @@
#include "chrome/renderer/prerender/prerender_helper.h"
#include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
#include "chrome/renderer/translate_helper.h"
+#include "chrome/renderer/webview_animating_overlay.h"
#include "chrome/renderer/webview_color_overlay.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/renderer/render_view.h"
@@ -381,17 +382,29 @@ void ChromeRenderViewObserver::OnSetClientSidePhishingDetection(
}
void ChromeRenderViewObserver::OnSetVisuallyDeemphasized(bool deemphasized) {
- bool already_deemphasized = !!dimmed_color_overlay_.get();
- if (already_deemphasized == deemphasized)
- return;
-
- if (deemphasized) {
- // 70% opaque grey.
- SkColor greyish = SkColorSetARGB(178, 0, 0, 0);
- dimmed_color_overlay_.reset(
- new WebViewColorOverlay(render_view(), greyish));
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableFramelessConstrainedDialogs)) {
+ if (!dimmed_animating_overlay_.get()) {
+ dimmed_animating_overlay_.reset(
+ new WebViewAnimatingOverlay(render_view()));
+ }
+ if (deemphasized)
+ dimmed_animating_overlay_->Show();
+ else
+ dimmed_animating_overlay_->Hide();
} else {
- dimmed_color_overlay_.reset();
+ bool already_deemphasized = !!dimmed_color_overlay_.get();
+ if (already_deemphasized == deemphasized)
+ return;
+
+ if (deemphasized) {
+ // 70% opaque grey.
+ SkColor greyish = SkColorSetARGB(178, 0, 0, 0);
+ dimmed_color_overlay_.reset(
+ new WebViewColorOverlay(render_view(), greyish));
+ } else {
+ dimmed_color_overlay_.reset();
+ }
}
}
« no previous file with comments | « chrome/renderer/chrome_render_view_observer.h ('k') | chrome/renderer/webview_animating_overlay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698