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

Side by Side Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2192553002: mash: Convert ShelfWindowWatcher to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits and better test Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/shelf/shelf_window_watcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/mus/bridge/wm_window_mus.h" 5 #include "ash/mus/bridge/wm_window_mus.h"
6 6
7 #include "ash/common/wm/container_finder.h" 7 #include "ash/common/wm/container_finder.h"
8 #include "ash/common/wm/window_state.h" 8 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_layout_manager.h" 9 #include "ash/common/wm_layout_manager.h"
10 #include "ash/common/wm_window_observer.h" 10 #include "ash/common/wm_window_observer.h"
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 if (key == WmWindowProperty::TOP_VIEW_INSET) { 338 if (key == WmWindowProperty::TOP_VIEW_INSET) {
339 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. 339 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
340 NOTIMPLEMENTED(); 340 NOTIMPLEMENTED();
341 return 0; 341 return 0;
342 } 342 }
343 343
344 NOTREACHED(); 344 NOTREACHED();
345 return 0; 345 return 0;
346 } 346 }
347 347
348 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) {
349 if (key == WmWindowProperty::SHELF_ID) {
350 NOTIMPLEMENTED();
351 return;
352 }
353
354 NOTREACHED();
355 }
356
357 ShelfItemDetails* WmWindowMus::GetShelfItemDetails() {
358 NOTIMPLEMENTED();
359 return nullptr;
360 }
361
348 const wm::WindowState* WmWindowMus::GetWindowState() const { 362 const wm::WindowState* WmWindowMus::GetWindowState() const {
349 return window_state_.get(); 363 return window_state_.get();
350 } 364 }
351 365
352 WmWindow* WmWindowMus::GetToplevelWindow() { 366 WmWindow* WmWindowMus::GetToplevelWindow() {
353 return WmShellMus::GetToplevelAncestor(window_); 367 return WmShellMus::GetToplevelAncestor(window_);
354 } 368 }
355 369
356 WmWindow* WmWindowMus::GetToplevelWindowForFocus() { 370 WmWindow* WmWindowMus::GetToplevelWindowForFocus() {
357 // TODO(sky): resolve if we really need two notions of top-level. In the mus 371 // TODO(sky): resolve if we really need two notions of top-level. In the mus
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 void WmWindowMus::OnWindowDestroying(::ui::Window* window) { 818 void WmWindowMus::OnWindowDestroying(::ui::Window* window) {
805 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this)); 819 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this));
806 } 820 }
807 821
808 void WmWindowMus::OnWindowDestroyed(::ui::Window* window) { 822 void WmWindowMus::OnWindowDestroyed(::ui::Window* window) {
809 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this)); 823 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this));
810 } 824 }
811 825
812 } // namespace mus 826 } // namespace mus
813 } // namespace ash 827 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/shelf/shelf_window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698