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

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

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content Created 4 years, 6 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_shelf_mus.h ('k') | ash/root_window_controller.cc » ('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_shelf_mus.h" 5 #include "ash/mus/bridge/wm_shelf_mus.h"
6 6
7 #include "ash/mus/bridge/wm_window_mus.h" 7 #include "ash/mus/bridge/wm_window_mus.h"
8 #include "ash/mus/shelf_layout_manager.h" 8 #include "ash/mus/shelf_layout_manager.h"
9 #include "components/mus/public/cpp/window.h" 9 #include "components/mus/public/cpp/window.h"
10 10
(...skipping 19 matching lines...) Expand all
30 return SHELF_ALIGNMENT_BOTTOM; 30 return SHELF_ALIGNMENT_BOTTOM;
31 case mash::shelf::mojom::Alignment::LEFT: 31 case mash::shelf::mojom::Alignment::LEFT:
32 return SHELF_ALIGNMENT_LEFT; 32 return SHELF_ALIGNMENT_LEFT;
33 case mash::shelf::mojom::Alignment::RIGHT: 33 case mash::shelf::mojom::Alignment::RIGHT:
34 return SHELF_ALIGNMENT_RIGHT; 34 return SHELF_ALIGNMENT_RIGHT;
35 } 35 }
36 NOTREACHED(); 36 NOTREACHED();
37 return SHELF_ALIGNMENT_BOTTOM; 37 return SHELF_ALIGNMENT_BOTTOM;
38 } 38 }
39 39
40 void WmShelfMus::SetAlignment(ShelfAlignment alignment) {
41 NOTIMPLEMENTED();
42 }
43
44 ShelfAutoHideBehavior WmShelfMus::GetAutoHideBehavior() const {
45 NOTIMPLEMENTED();
46 return SHELF_AUTO_HIDE_BEHAVIOR_NEVER;
47 }
48
49 void WmShelfMus::SetAutoHideBehavior(ShelfAutoHideBehavior behavior) {
50 NOTIMPLEMENTED();
51 }
52
40 ShelfBackgroundType WmShelfMus::GetBackgroundType() const { 53 ShelfBackgroundType WmShelfMus::GetBackgroundType() const {
41 NOTIMPLEMENTED(); 54 NOTIMPLEMENTED();
42 return SHELF_BACKGROUND_DEFAULT; 55 return SHELF_BACKGROUND_DEFAULT;
43 } 56 }
44 57
45 void WmShelfMus::UpdateVisibilityState() { 58 void WmShelfMus::UpdateVisibilityState() {
46 NOTIMPLEMENTED(); 59 NOTIMPLEMENTED();
47 } 60 }
48 61
49 ShelfVisibilityState WmShelfMus::GetVisibilityState() const { 62 ShelfVisibilityState WmShelfMus::GetVisibilityState() const {
(...skipping 13 matching lines...) Expand all
63 void WmShelfMus::AddObserver(WmShelfObserver* observer) { 76 void WmShelfMus::AddObserver(WmShelfObserver* observer) {
64 observers_.AddObserver(observer); 77 observers_.AddObserver(observer);
65 } 78 }
66 79
67 void WmShelfMus::RemoveObserver(WmShelfObserver* observer) { 80 void WmShelfMus::RemoveObserver(WmShelfObserver* observer) {
68 observers_.RemoveObserver(observer); 81 observers_.RemoveObserver(observer);
69 } 82 }
70 83
71 } // namespace mus 84 } // namespace mus
72 } // namespace ash 85 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698