Index: ash/mus/sysui/sysui_application.h |
diff --git a/mash/shelf/shelf_application.h b/ash/mus/sysui/sysui_application.h |
similarity index 51% |
copy from mash/shelf/shelf_application.h |
copy to ash/mus/sysui/sysui_application.h |
index 901bdfa62a75e8b923890dcf8791889db5e833b5..21c4a9d3afbf86a91ea09a82a4a79c1b0ea213d7 100644 |
--- a/mash/shelf/shelf_application.h |
+++ b/ash/mus/sysui/sysui_application.h |
@@ -1,26 +1,24 @@ |
-// Copyright 2015 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 MASH_SHELF_SHELF_APPLICATION_H_ |
-#define MASH_SHELF_SHELF_APPLICATION_H_ |
+#ifndef ASH_MUS_SYSUI_SYSUI_APPLICATION_H_ |
+#define ASH_MUS_SYSUI_SYSUI_APPLICATION_H_ |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "mojo/services/tracing/public/cpp/tracing_impl.h" |
#include "mojo/shell/public/cpp/application_delegate.h" |
-namespace views { |
-class AuraInit; |
-} |
+namespace ash { |
+namespace sysui { |
-namespace mash { |
-namespace shelf { |
+class AshInit; |
-class ShelfApplication : public mojo::ApplicationDelegate { |
+class SysUIApplication : public mojo::ApplicationDelegate { |
public: |
- ShelfApplication(); |
- ~ShelfApplication() override; |
+ SysUIApplication(); |
+ ~SysUIApplication() override; |
private: |
// mojo::ApplicationDelegate: |
@@ -29,13 +27,12 @@ class ShelfApplication : public mojo::ApplicationDelegate { |
mojo::ApplicationConnection* connection) override; |
mojo::TracingImpl tracing_; |
+ scoped_ptr<AshInit> ash_init_; |
- scoped_ptr<views::AuraInit> aura_init_; |
- |
- DISALLOW_COPY_AND_ASSIGN(ShelfApplication); |
+ DISALLOW_COPY_AND_ASSIGN(SysUIApplication); |
}; |
-} // namespace shelf |
-} // namespace mash |
+} // namespace sysui |
+} // namespace ash |
-#endif // MASH_SHELF_SHELF_APPLICATION_H_ |
+#endif // ASH_MUS_SYSUI_SYSUI_APPLICATION_H_ |