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

Side by Side Diff: mandoline/ui/aura/aura_init.h

Issue 1340983002: Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated all the namespaces in mus Created 5 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MANDOLINE_UI_AURA_AURA_INIT_H_ 5 #ifndef MANDOLINE_UI_AURA_AURA_INIT_H_
6 #define MANDOLINE_UI_AURA_AURA_INIT_H_ 6 #define MANDOLINE_UI_AURA_AURA_INIT_H_
7 7
8 #include "ui/mojo/init/ui_init.h" 8 #include "ui/mojo/init/ui_init.h"
9 9
10 namespace mojo { 10 namespace mojo {
11 class Shell; 11 class Shell;
12 }
13
14 namespace mus {
12 class View; 15 class View;
13 } 16 }
14 17
15 namespace mandoline { 18 namespace mandoline {
16 19
17 // Sets up necessary state for aura when run with the viewmanager. 20 // Sets up necessary state for aura when run with the viewmanager.
18 class AuraInit { 21 class AuraInit {
19 public: 22 public:
20 AuraInit(mojo::View* root, mojo::Shell* shell); 23 AuraInit(mus::View* root, mojo::Shell* shell);
21 ~AuraInit(); 24 ~AuraInit();
22 25
23 private: 26 private:
24 void InitializeResources(mojo::Shell* shell); 27 void InitializeResources(mojo::Shell* shell);
25 28
26 ui::mojo::UIInit ui_init_; 29 ui::mojo::UIInit ui_init_;
27 30
28 DISALLOW_COPY_AND_ASSIGN(AuraInit); 31 DISALLOW_COPY_AND_ASSIGN(AuraInit);
29 }; 32 };
30 33
31 } // namespace mandoline 34 } // namespace mandoline
32 35
33 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_ 36 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698