Commit e8303e89 authored by Evan Stade's avatar Evan Stade Committed by Commit Bot

[Mash] fix color of Settings app frame.

Bug: 834092
Change-Id: I0676206a08de89cb6f4a8d0884228357b9576d60
Reviewed-on: https://chromium-review.googlesource.com/1028982Reviewed-by: default avatarScott Violet <sky@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555618}
parent 60e415eb
...@@ -19,6 +19,11 @@ class BrowserFrameAsh : public views::NativeWidgetAura, ...@@ -19,6 +19,11 @@ class BrowserFrameAsh : public views::NativeWidgetAura,
public: public:
BrowserFrameAsh(BrowserFrame* browser_frame, BrowserView* browser_view); BrowserFrameAsh(BrowserFrame* browser_frame, BrowserView* browser_view);
// The color used for the frame when showing a non-tabbed WebUI, such as
// the Settings window.
static constexpr SkColor kMdWebUiFrameColor =
SkColorSetARGB(0xff, 0x25, 0x4f, 0xae);
protected: protected:
~BrowserFrameAsh() override; ~BrowserFrameAsh() override;
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "ash/public/interfaces/window_properties.mojom.h" #include "ash/public/interfaces/window_properties.mojom.h"
#include "ash/public/interfaces/window_style.mojom.h" #include "ash/public/interfaces/window_style.mojom.h"
#include "chrome/browser/chromeos/ash_config.h" #include "chrome/browser/chromeos/ash_config.h"
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "services/ui/public/interfaces/window_manager.mojom.h" #include "services/ui/public/interfaces/window_manager.mojom.h"
#endif #endif
...@@ -56,6 +57,7 @@ views::Widget::InitParams BrowserFrameMus::GetWidgetParams() { ...@@ -56,6 +57,7 @@ views::Widget::InitParams BrowserFrameMus::GetWidgetParams() {
properties[ui::mojom::WindowManager::kDisableImmersive_InitProperty] = properties[ui::mojom::WindowManager::kDisableImmersive_InitProperty] =
mojo::ConvertTo<std::vector<uint8_t>>(true); mojo::ConvertTo<std::vector<uint8_t>>(true);
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
Browser* browser = browser_view_->browser();
properties[ash::mojom::kAshWindowStyle_InitProperty] = properties[ash::mojom::kAshWindowStyle_InitProperty] =
mojo::ConvertTo<std::vector<uint8_t>>( mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int32_t>(ash::mojom::WindowStyle::BROWSER)); static_cast<int32_t>(ash::mojom::WindowStyle::BROWSER));
...@@ -66,10 +68,19 @@ views::Widget::InitParams BrowserFrameMus::GetWidgetParams() { ...@@ -66,10 +68,19 @@ views::Widget::InitParams BrowserFrameMus::GetWidgetParams() {
static_cast<int64_t>(ash::TYPE_BROWSER_SHORTCUT)); static_cast<int64_t>(ash::TYPE_BROWSER_SHORTCUT));
properties[ash::mojom::kWindowPositionManaged_Property] = properties[ash::mojom::kWindowPositionManaged_Property] =
mojo::ConvertTo<std::vector<uint8_t>>( mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int64_t>(browser_view_->browser()->is_type_popup())); static_cast<int64_t>(browser->is_type_popup()));
properties[ash::mojom::kCanConsumeSystemKeys_Property] = properties[ash::mojom::kCanConsumeSystemKeys_Property] =
mojo::ConvertTo<std::vector<uint8_t>>( mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int64_t>(browser_view_->browser()->is_app())); static_cast<int64_t>(browser->is_app()));
// Set the frame color for WebUI windows, e.g. settings.
if (!browser->is_type_tabbed() && browser->is_trusted_source()) {
properties[ui::mojom::WindowManager::kActiveFrameColor_InitProperty] =
mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int32_t>(BrowserFrameAsh::kMdWebUiFrameColor));
properties[ui::mojom::WindowManager::kInactiveFrameColor_InitProperty] =
mojo::ConvertTo<std::vector<uint8_t>>(
static_cast<int32_t>(BrowserFrameAsh::kMdWebUiFrameColor));
}
#endif #endif
aura::WindowTreeHostMusInitParams window_tree_host_init_params = aura::WindowTreeHostMusInitParams window_tree_host_init_params =
aura::CreateInitParamsForTopLevel( aura::CreateInitParamsForTopLevel(
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "chrome/browser/ui/extensions/hosted_app_browser_controller.h" #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
#include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/layout_constants.h"
#include "chrome/browser/ui/views/frame/browser_frame.h" #include "chrome/browser/ui/views/frame/browser_frame.h"
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "chrome/browser/ui/views/frame/browser_frame_header_ash.h" #include "chrome/browser/ui/views/frame/browser_frame_header_ash.h"
#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/hosted_app_button_container.h" #include "chrome/browser/ui/views/frame/hosted_app_button_container.h"
...@@ -668,11 +669,8 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() { ...@@ -668,11 +669,8 @@ BrowserNonClientFrameViewAsh::CreateFrameHeader() {
weak_factory_.GetWeakPtr()), weak_factory_.GetWeakPtr()),
kTitlebarAnimationDelay); kTitlebarAnimationDelay);
} else if (!browser->is_app()) { } else if (!browser->is_app()) {
// For non app (i.e. WebUI) windows (e.g. Settings) use MD frame color. default_frame_header->SetFrameColors(BrowserFrameAsh::kMdWebUiFrameColor,
constexpr SkColor kMdWebUIFrameColor = BrowserFrameAsh::kMdWebUiFrameColor);
SkColorSetARGB(0xff, 0x25, 0x4f, 0xae);
default_frame_header->SetFrameColors(kMdWebUIFrameColor,
kMdWebUIFrameColor);
} }
if (back_button_) if (back_button_)
......
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