Commit cc029955 authored by stevenjb's avatar stevenjb Committed by Commit bot

Revert of Set the Ash browser frame color for MD WebUI (Settings) (patchset #3...

Revert of Set the Ash browser frame color for MD WebUI (Settings) (patchset #3 id:40001 of https://codereview.chromium.org/2676673003/ )

Reason for revert:
Broke this builder:
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Builder%20%28dbg%29/builds/83127

Original issue's description:
> Set the Ash browser frame color for MD WebUI (Settings)
>
> Currently Settings is the only Web IU we show in a dedicated browser
> window on Ash (Chrome OS).
>
> BUG=684129
>
> Review-Url: https://codereview.chromium.org/2676673003
> Cr-Commit-Position: refs/heads/master@{#448024}
> Committed: https://chromium.googlesource.com/chromium/src/+/31dc779f1ecd8dabd26dfed11bef773c95ae5b47

TBR=sky@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=684129

Review-Url: https://codereview.chromium.org/2672083002
Cr-Commit-Position: refs/heads/master@{#448029}
parent da35973f
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "ash/common/wm_lookup.h" #include "ash/common/wm_lookup.h"
#include "ash/common/wm_shell.h" #include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h" #include "ash/common/wm_window.h"
#include "base/feature_list.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/profiles/profiles_state.h" #include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_properties.h"
...@@ -31,10 +30,8 @@ ...@@ -31,10 +30,8 @@
#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/tabs/tab_strip.h"
#include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
#include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/web_applications/web_app.h"
#include "chrome/common/chrome_features.h"
#include "chrome/grit/theme_resources.h" #include "chrome/grit/theme_resources.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/accessibility/ax_node_data.h" #include "ui/accessibility/ax_node_data.h"
#include "ui/aura/client/aura_constants.h" #include "ui/aura/client/aura_constants.h"
#include "ui/aura/window.h" #include "ui/aura/window.h"
...@@ -57,13 +54,11 @@ ...@@ -57,13 +54,11 @@
namespace { namespace {
// Space between right edge of tabstrip and maximize button. // Space between right edge of tabstrip and maximize button.
constexpr int kTabstripRightSpacing = 10; const int kTabstripRightSpacing = 10;
// Height of the shadow in the tab image, used to ensure clicks in the shadow // Height of the shadow in the tab image, used to ensure clicks in the shadow
// area still drag restored windows. This keeps the clickable area large enough // area still drag restored windows. This keeps the clickable area large enough
// to hit easily. // to hit easily.
constexpr int kTabShadowHeight = 4; const int kTabShadowHeight = 4;
constexpr SkColor kMdWebUIFrameColor = SkColorSetRGB(0x25, 0x4f, 0xae);
} // namespace } // namespace
...@@ -105,11 +100,6 @@ void BrowserNonClientFrameViewAsh::Init() { ...@@ -105,11 +100,6 @@ void BrowserNonClientFrameViewAsh::Init() {
header_painter->Init(frame(), this, caption_button_container_); header_painter->Init(frame(), this, caption_button_container_);
if (window_icon_) if (window_icon_)
header_painter->UpdateLeftHeaderView(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);
}
} else { } else {
BrowserHeaderPainterAsh* header_painter = new BrowserHeaderPainterAsh; BrowserHeaderPainterAsh* header_painter = new BrowserHeaderPainterAsh;
header_painter_.reset(header_painter); header_painter_.reset(header_painter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment