Commit 71ef7ba0 authored by James Cook's avatar James Cook Committed by Commit Bot

cros: Remove NOTIMPLEMENTED for StatusBubbleViews under mash

It has an implementation for ignored_by_shelf, so we don't need to
warn anymore.

Bug: none
Test: chrome --mash, don't see warning
Change-Id: Iee5a01ae50cc5a54190ce3dc6a1f71a23c980d83
Reviewed-on: https://chromium-review.googlesource.com/741864Reviewed-by: default avatarMichael Wasserman <msw@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512602}
parent 933d12e3
...@@ -40,12 +40,9 @@ ...@@ -40,12 +40,9 @@
#include "url/gurl.h" #include "url/gurl.h"
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
#include "ash/shell.h" #include "ash/shell.h" // mash-ok
#include "ash/wm/window_state.h" #include "ash/wm/window_state.h" // mash-ok
#endif #include "services/ui/public/cpp/property_type_converters.h" // nogncheck
#if defined(USE_AURA)
#include "services/ui/public/cpp/property_type_converters.h" // nogncheck
#include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck #include "services/ui/public/interfaces/window_manager.mojom.h" // nogncheck
#endif #endif
...@@ -657,7 +654,7 @@ void StatusBubbleViews::Init() { ...@@ -657,7 +654,7 @@ void StatusBubbleViews::Init() {
params.parent = frame->GetNativeView(); params.parent = frame->GetNativeView();
params.context = frame->GetNativeWindow(); params.context = frame->GetNativeWindow();
params.name = "StatusBubble"; params.name = "StatusBubble";
#if defined(USE_AURA) #if defined(OS_CHROMEOS)
params.mus_properties params.mus_properties
[ui::mojom::WindowManager::kWindowIgnoredByShelf_InitProperty] = [ui::mojom::WindowManager::kWindowIgnoredByShelf_InitProperty] =
mojo::ConvertTo<std::vector<uint8_t>>(true); mojo::ConvertTo<std::vector<uint8_t>>(true);
...@@ -668,12 +665,10 @@ void StatusBubbleViews::Init() { ...@@ -668,12 +665,10 @@ void StatusBubbleViews::Init() {
popup_->SetOpacity(0.f); popup_->SetOpacity(0.f);
popup_->SetContentsView(view_); popup_->SetContentsView(view_);
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
// Mash is handled via mus_properties.
if (ash::Shell::HasInstance()) { if (ash::Shell::HasInstance()) {
ash::wm::GetWindowState(popup_->GetNativeWindow()) ash::wm::GetWindowState(popup_->GetNativeWindow())
->set_ignored_by_shelf(true); ->set_ignored_by_shelf(true);
} else {
// TODO: need mash implementation.
NOTIMPLEMENTED();
} }
#endif #endif
RepositionPopup(); RepositionPopup();
......
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