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

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 2791463002: mash: Remove ShelfDelegate; move functions to ShelfModel. (Closed)
Patch Set: Address comment. Created 3 years, 8 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
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 0532775974ca4fb612b2ec9e71fbc17144127820..8aab1aee913dfbfc233d50f7a6d00a23c650b697 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -16,7 +16,6 @@
#include "ash/shell/example_factory.h"
#include "ash/shell/toplevel_window.h"
#include "ash/test/test_keyboard_ui.h"
-#include "ash/test/test_shelf_delegate.h"
#include "ash/test/test_system_tray_delegate.h"
#include "ash/wm/window_state.h"
#include "base/memory/ptr_util.h"
@@ -122,9 +121,9 @@ keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() {
void ShellDelegateImpl::OpenUrlFromArc(const GURL& url) {}
-ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
- return new test::TestShelfDelegate();
-}
+void ShellDelegateImpl::ShelfInit() {}
+
+void ShellDelegateImpl::ShelfShutdown() {}
SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
return new test::TestSystemTrayDelegate;
« no previous file with comments | « ash/shell/shell_delegate_impl.h ('k') | ash/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698