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

Side by Side Diff: ash/mus/shell_delegate_mus.cc

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: curlies 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_shelf_mus.cc ('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/shell_delegate_mus.h" 5 #include "ash/mus/shell_delegate_mus.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/common/gpu_support_stub.h" 9 #include "ash/common/gpu_support_stub.h"
10 #include "ash/common/media_delegate.h" 10 #include "ash/common/media_delegate.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 private: 97 private:
98 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); 98 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
99 }; 99 };
100 100
101 class ShelfDelegateStub : public ShelfDelegate { 101 class ShelfDelegateStub : public ShelfDelegate {
102 public: 102 public:
103 ShelfDelegateStub() {} 103 ShelfDelegateStub() {}
104 ~ShelfDelegateStub() override {} 104 ~ShelfDelegateStub() override {}
105 105
106 // ShelfDelegate overrides: 106 // ShelfDelegate overrides:
107 void OnShelfCreated(Shelf* shelf) override {} 107 void OnShelfCreated(WmShelf* shelf) override {}
108 void OnShelfDestroyed(Shelf* shelf) override {} 108 void OnShelfDestroyed(WmShelf* shelf) override {}
109 void OnShelfAlignmentChanged(Shelf* shelf) override {} 109 void OnShelfAlignmentChanged(WmShelf* shelf) override {}
110 void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {} 110 void OnShelfAutoHideBehaviorChanged(WmShelf* shelf) override {}
111 void OnShelfAutoHideStateChanged(Shelf* shelf) override {} 111 void OnShelfAutoHideStateChanged(WmShelf* shelf) override {}
112 void OnShelfVisibilityStateChanged(Shelf* shelf) override {} 112 void OnShelfVisibilityStateChanged(WmShelf* shelf) override {}
113 ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; } 113 ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; }
114 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; } 114 bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; }
115 const std::string& GetAppIDForShelfID(ShelfID id) override { 115 const std::string& GetAppIDForShelfID(ShelfID id) override {
116 return base::EmptyString(); 116 return base::EmptyString();
117 } 117 }
118 void PinAppWithID(const std::string& app_id) override {} 118 void PinAppWithID(const std::string& app_id) override {}
119 bool IsAppPinned(const std::string& app_id) override { return false; } 119 bool IsAppPinned(const std::string& app_id) override { return false; }
120 void UnpinAppWithID(const std::string& app_id) override {} 120 void UnpinAppWithID(const std::string& app_id) override {}
121 121
122 private: 122 private:
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 NOTIMPLEMENTED(); 243 NOTIMPLEMENTED();
244 return base::string16(); 244 return base::string16();
245 } 245 }
246 246
247 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 247 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
248 NOTIMPLEMENTED(); 248 NOTIMPLEMENTED();
249 return gfx::Image(); 249 return gfx::Image();
250 } 250 }
251 251
252 } // namespace ash 252 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698