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

Unified Diff: ash/mus/shell_delegate_mus.cc

Issue 2247503002: mash: Create and show a shelf in mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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 side-by-side diff with in-line comments
Download patch
Index: ash/mus/shell_delegate_mus.cc
diff --git a/ash/mus/shell_delegate_mus.cc b/ash/mus/shell_delegate_mus.cc
index 32ffcd4e562f5ded27b1835324b0600cc4ddb256..d82d9baeb1e8cd69bdba9b9dafefe6fdeb7a65a0 100644
--- a/ash/mus/shell_delegate_mus.cc
+++ b/ash/mus/shell_delegate_mus.cc
@@ -11,11 +11,13 @@
#include "ash/common/palette_delegate.h"
#include "ash/common/pointer_watcher_delegate.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/shelf_delegate.h"
#include "ash/common/system/tray/default_system_tray_delegate.h"
#include "ash/mus/accessibility_delegate_mus.h"
#include "ash/mus/new_window_delegate_mus.h"
#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
+#include "base/strings/string_util.h"
#include "components/user_manager/user_info_impl.h"
#include "ui/app_list/presenter/app_list_presenter.h"
#include "ui/gfx/image/image.h"
@@ -97,6 +99,31 @@ class MediaDelegateStub : public MediaDelegate {
DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub);
};
+class ShelfDelegateStub : public ShelfDelegate {
+ public:
+ ShelfDelegateStub() {}
+ ~ShelfDelegateStub() override {}
+
+ // ShelfDelegate overrides:
+ void OnShelfCreated(Shelf* shelf) override {}
+ void OnShelfDestroyed(Shelf* shelf) override {}
+ void OnShelfAlignmentChanged(Shelf* shelf) override {}
+ void OnShelfAutoHideBehaviorChanged(Shelf* shelf) override {}
+ void OnShelfAutoHideStateChanged(Shelf* shelf) override {}
+ void OnShelfVisibilityStateChanged(Shelf* shelf) override {}
+ ShelfID GetShelfIDForAppID(const std::string& app_id) override { return 0; }
+ bool HasShelfIDToAppIDMapping(ShelfID id) const override { return false; }
+ const std::string& GetAppIDForShelfID(ShelfID id) override {
+ return base::EmptyString();
+ }
+ void PinAppWithID(const std::string& app_id) override {}
+ bool IsAppPinned(const std::string& app_id) override { return false; }
+ void UnpinAppWithID(const std::string& app_id) override {}
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ShelfDelegateStub);
+};
+
} // namespace
ShellDelegateMus::ShellDelegateMus(
@@ -165,8 +192,8 @@ app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() {
}
ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
- NOTIMPLEMENTED();
- return nullptr;
+ // TODO(mash): Implement a real shelf delegate; maybe port ShelfDelegateMus?
+ return new ShelfDelegateStub;
}
SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {

Powered by Google App Engine
This is Rietveld 408576698