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

Unified Diff: ash/mus/shell_delegate_mus.h

Issue 1676713002: ash/mash: Add a mus-client that sets up ash to provide the system ui for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix-cros-build Created 4 years, 10 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/mus/main.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/shell_delegate_mus.h
diff --git a/ash/shell/shell_delegate_impl.h b/ash/mus/shell_delegate_mus.h
similarity index 78%
copy from ash/shell/shell_delegate_impl.h
copy to ash/mus/shell_delegate_mus.h
index dbcaa59066ecfed8869617a1083cf795fb0cb9f6..a9ca638c535776853661d4a2a4dde0752326a47f 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/mus/shell_delegate_mus.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_SHELL_SHELL_DELEGATE_IMPL_H_
-#define ASH_SHELL_SHELL_DELEGATE_IMPL_H_
+#ifndef ASH_MUS_SHELL_DELEGATE_MUS_H_
+#define ASH_MUS_SHELL_DELEGATE_MUS_H_
#include <string>
@@ -16,14 +16,12 @@ class KeyboardUI;
}
namespace ash {
-namespace shell {
+namespace sysui {
-class ShelfDelegateImpl;
-
-class ShellDelegateImpl : public ash::ShellDelegate {
+class ShellDelegateMus : public ash::ShellDelegate {
public:
- ShellDelegateImpl();
- ~ShellDelegateImpl() override;
+ ShellDelegateMus();
+ ~ShellDelegateMus() override;
bool IsFirstRunAfterBoot() const override;
bool IsIncognitoAllowed() const override;
@@ -56,13 +54,10 @@ class ShellDelegateImpl : public ash::ShellDelegate {
gfx::Image GetDeprecatedAcceleratorImage() const override;
private:
- ShelfDelegateImpl* shelf_delegate_;
- scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);
+ DISALLOW_COPY_AND_ASSIGN(ShellDelegateMus);
};
-} // namespace shell
+} // namespace sysui
} // namespace ash
-#endif // ASH_SHELL_SHELL_DELEGATE_IMPL_H_
+#endif // ASH_MUS_SHELL_DELEGATE_MUS_H_
« no previous file with comments | « ash/mus/main.cc ('k') | ash/mus/shell_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698