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

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

Issue 2913343002: Start removing deprecated Options UI code (Closed)
Patch Set: thestig@ review Created 3 years, 6 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/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index c348f621b7afed46930ea26dc9db33e94acbb154..5d68c5024279e06f98fd2449a8e6fe232d103d5b 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -13,7 +13,6 @@
#include "ash/frame/header_painter_util.h"
#include "ash/shell.h"
#include "ash/wm/window_util.h"
-#include "base/feature_list.h"
#include "build/build_config.h"
#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/themes/theme_properties.h"
@@ -29,7 +28,6 @@
#include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/chrome_features.h"
#include "chrome/grit/theme_resources.h"
#include "content/public/browser/web_contents.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -102,11 +100,9 @@ void BrowserNonClientFrameViewAsh::Init() {
header_painter->Init(frame(), this, caption_button_container_);
if (window_icon_)
header_painter->UpdateLeftHeaderView(window_icon_);
- if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
- // For non app (i.e. WebUI) windows (e.g. Settings) use MD frame color.
- if (!browser_view()->browser()->is_app())
- header_painter->SetFrameColors(kMdWebUIFrameColor, kMdWebUIFrameColor);
- }
+ // For non app (i.e. WebUI) windows (e.g. Settings) use MD frame color.
+ if (!browser_view()->browser()->is_app())
+ header_painter->SetFrameColors(kMdWebUIFrameColor, kMdWebUIFrameColor);
} else {
BrowserHeaderPainterAsh* header_painter = new BrowserHeaderPainterAsh;
header_painter_.reset(header_painter);
« no previous file with comments | « chrome/browser/ui/chrome_pages.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698