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

Unified Diff: chrome/browser/ui/views/frame/browser_header_painter_ash.cc

Issue 1505353002: Remove the restored window highlight in Ash material design (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_header_painter_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
index e6022e93a92f77dbe24cf51910cb6a8d17a2a155..710951ba8d95b28be595a179fbf44ca418ea1837 100644
--- a/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_header_painter_ash.cc
@@ -15,6 +15,7 @@
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/theme_provider.h"
#include "ui/gfx/animation/slide_animation.h"
@@ -218,8 +219,12 @@ void BrowserHeaderPainterAsh::PaintHeader(gfx::Canvas* canvas, Mode mode) {
ash::HeaderPainterUtil::GetThemeBackgroundXInset());
}
- if (!frame_->IsMaximized() && !frame_->IsFullscreen())
+ if (!ui::MaterialDesignController::IsModeMaterial() &&
+ !frame_->IsMaximized() &&
+ !frame_->IsFullscreen()) {
PaintHighlightForRestoredWindow(canvas);
+ }
+
if (frame_->widget_delegate() &&
frame_->widget_delegate()->ShouldShowWindowTitle()) {
PaintTitleBar(canvas);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698