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

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

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 years, 1 month 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
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/shelf/shelf_item_types.h" 7 #include "ash/common/shelf/shelf_item_types.h"
8 #include "ash/common/wm/container_finder.h" 8 #include "ash/common/wm/container_finder.h"
9 #include "ash/common/wm/window_positioning_utils.h" 9 #include "ash/common/wm/window_positioning_utils.h"
10 #include "ash/common/wm/window_state.h" 10 #include "ash/common/wm/window_state.h"
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 484
485 if (key == WmWindowProperty::TOP_VIEW_INSET) { 485 if (key == WmWindowProperty::TOP_VIEW_INSET) {
486 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. 486 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
487 NOTIMPLEMENTED(); 487 NOTIMPLEMENTED();
488 return; 488 return;
489 } 489 }
490 490
491 NOTREACHED(); 491 NOTREACHED();
492 } 492 }
493 493
494 gfx::ImageSkia WmWindowMus::GetWindowIcon() {
495 NOTIMPLEMENTED();
496 return gfx::ImageSkia();
497 }
498
499 gfx::ImageSkia WmWindowMus::GetAppIcon() {
500 NOTIMPLEMENTED();
501 return gfx::ImageSkia();
502 }
503
494 const wm::WindowState* WmWindowMus::GetWindowState() const { 504 const wm::WindowState* WmWindowMus::GetWindowState() const {
495 return window_state_.get(); 505 return window_state_.get();
496 } 506 }
497 507
498 WmWindow* WmWindowMus::GetToplevelWindow() { 508 WmWindow* WmWindowMus::GetToplevelWindow() {
499 return WmShellMus::GetToplevelAncestor(window_); 509 return WmShellMus::GetToplevelAncestor(window_);
500 } 510 }
501 511
502 WmWindow* WmWindowMus::GetToplevelWindowForFocus() { 512 WmWindow* WmWindowMus::GetToplevelWindowForFocus() {
503 // TODO(sky): resolve if we really need two notions of top-level. In the mus 513 // TODO(sky): resolve if we really need two notions of top-level. In the mus
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 } 1034 }
1025 1035
1026 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, 1036 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
1027 ui::Window* transient) { 1037 ui::Window* transient) {
1028 for (auto& observer : transient_observers_) 1038 for (auto& observer : transient_observers_)
1029 observer.OnTransientChildRemoved(this, Get(transient)); 1039 observer.OnTransientChildRemoved(this, Get(transient));
1030 } 1040 }
1031 1041
1032 } // namespace mus 1042 } // namespace mus
1033 } // namespace ash 1043 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698