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

Unified Diff: ash/mus/shell_delegate_mus.h

Issue 2150023002: Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix deps Created 4 years, 5 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.h
diff --git a/ash/sysui/shell_delegate_mus.h b/ash/mus/shell_delegate_mus.h
similarity index 86%
copy from ash/sysui/shell_delegate_mus.h
copy to ash/mus/shell_delegate_mus.h
index c5323bc1b08f3a951d0e359a4a3699ca507f4e4a..e6dce759f067e426153470f8e9d9af95471cd488 100644
--- a/ash/sysui/shell_delegate_mus.h
+++ b/ash/mus/shell_delegate_mus.h
@@ -2,27 +2,23 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SYSUI_SHELL_DELEGATE_MUS_H_
-#define ASH_SYSUI_SHELL_DELEGATE_MUS_H_
+#ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
+#define ASH_MUS_SHELL_DELEGATE_MUS_H_
#include <memory>
#include "ash/common/shell_delegate.h"
#include "base/macros.h"
-namespace keyboard {
-class KeyboardUI;
+namespace app_list {
+class AppListPresenter;
}
namespace ash {
-class AppListPresenterMus;
-
-namespace sysui {
-
class ShellDelegateMus : public ShellDelegate {
public:
- explicit ShellDelegateMus(std::unique_ptr<AppListPresenterMus>);
+ explicit ShellDelegateMus(std::unique_ptr<app_list::AppListPresenter>);
msw 2016/07/14 19:50:05 optional nit: give this parameter a name here, |ap
James Cook 2016/07/14 20:54:44 Whoops! Done.
~ShellDelegateMus() override;
bool IsFirstRunAfterBoot() const override;
@@ -58,7 +54,6 @@ class ShellDelegateMus : public ShellDelegate {
DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
};
-} // namespace sysui
} // namespace ash
-#endif // ASH_SYSUI_SHELL_DELEGATE_MUS_H_
+#endif // ASH_MUS_SHELL_DELEGATE_MUS_H_

Powered by Google App Engine
This is Rietveld 408576698