Index: mash/shelf/shelf_application.h |
diff --git a/mash/system_ui/system_ui.h b/mash/shelf/shelf_application.h |
similarity index 60% |
rename from mash/system_ui/system_ui.h |
rename to mash/shelf/shelf_application.h |
index 86bfb22b5018c44d13b1e5e9b6b036596058712d..3592cdfd3159b1a314486938f9f56db0d1b101f2 100644 |
--- a/mash/system_ui/system_ui.h |
+++ b/mash/shelf/shelf_application.h |
@@ -2,25 +2,27 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MASH_SYSTEM_UI_SYSTEM_UI_H_ |
-#define MASH_SYSTEM_UI_SYSTEM_UI_H_ |
+#ifndef MASH_SHELF_SHELF_APPLICATION_H_ |
+#define MASH_SHELF_SHELF_APPLICATION_H_ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
+#include "components/mus/public/interfaces/user_window_controller.mojom.h" |
#include "mojo/services/tracing/public/cpp/tracing_impl.h" |
#include "mojo/shell/public/cpp/application_delegate.h" |
+#include "mojo/shell/public/cpp/interface_factory_impl.h" |
namespace views { |
class AuraInit; |
} |
namespace mash { |
-namespace system_ui { |
+namespace shelf { |
-class SystemUI : public mojo::ApplicationDelegate { |
+class ShelfApplication : public mojo::ApplicationDelegate { |
public: |
- SystemUI(); |
- ~SystemUI() override; |
+ ShelfApplication(); |
+ ~ShelfApplication() override; |
private: |
// mojo::ApplicationDelegate: |
@@ -32,10 +34,10 @@ class SystemUI : public mojo::ApplicationDelegate { |
scoped_ptr<views::AuraInit> aura_init_; |
- DISALLOW_COPY_AND_ASSIGN(SystemUI); |
+ DISALLOW_COPY_AND_ASSIGN(ShelfApplication); |
}; |
-} // namespace system_ui |
+} // namespace shelf |
} // namespace mash |
-#endif // MASH_SYSTEM_UI_SYSTEM_UI_H_ |
+#endif // MASH_SHELF_SHELF_APPLICATION_H_ |