| Index: mash/wm/bridge/wm_root_window_controller_mus.cc
|
| diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/mash/wm/bridge/wm_root_window_controller_mus.cc
|
| index 0f9547dc234c923a05615e3e8f285982240aa5f6..f98a00764cd08b8cd3053bdcee625931f05180b4 100644
|
| --- a/mash/wm/bridge/wm_root_window_controller_mus.cc
|
| +++ b/mash/wm/bridge/wm_root_window_controller_mus.cc
|
| @@ -20,8 +20,7 @@ MUS_DECLARE_WINDOW_PROPERTY_TYPE(mash::wm::WmRootWindowControllerMus*);
|
| namespace mash {
|
| namespace wm {
|
|
|
| -// TODO(sky): it likely makes more sense to hang this off RootWindowSettings.
|
| -MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(mash::wm::WmRootWindowControllerMus,
|
| +MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(mash::wm::WmRootWindowControllerMus*,
|
| kWmRootWindowControllerKey,
|
| nullptr);
|
|
|
| @@ -47,6 +46,12 @@ const WmRootWindowControllerMus* WmRootWindowControllerMus::Get(
|
| return window->GetRoot()->GetLocalProperty(kWmRootWindowControllerKey);
|
| }
|
|
|
| +void WmRootWindowControllerMus::NotifyFullscreenStateChange(
|
| + bool is_fullscreen) {
|
| + FOR_EACH_OBSERVER(ash::wm::WmRootWindowControllerObserver, observers_,
|
| + OnFullscreenStateChanged(is_fullscreen));
|
| +}
|
| +
|
| gfx::Point WmRootWindowControllerMus::ConvertPointToScreen(
|
| const WmWindowMus* source,
|
| const gfx::Point& point) const {
|
| @@ -120,12 +125,12 @@ ash::wm::WmWindow* WmRootWindowControllerMus::FindEventTarget(
|
|
|
| void WmRootWindowControllerMus::AddObserver(
|
| ash::wm::WmRootWindowControllerObserver* observer) {
|
| - NOTIMPLEMENTED();
|
| + observers_.AddObserver(observer);
|
| }
|
|
|
| void WmRootWindowControllerMus::RemoveObserver(
|
| ash::wm::WmRootWindowControllerObserver* observer) {
|
| - NOTIMPLEMENTED();
|
| + observers_.RemoveObserver(observer);
|
| }
|
|
|
| } // namespace wm
|
|
|