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

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

Issue 1351013002: Revert of Mandoline UI Process: Update namespaces and file names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 "skia/ext/refptr.h" 8 #include "skia/ext/refptr.h"
9 #include "ui/mojo/init/ui_init.h" 9 #include "ui/mojo/init/ui_init.h"
10 10
11 namespace font_service { 11 namespace font_service {
12 class FontLoader; 12 class FontLoader;
13 } 13 }
14 14
15 namespace mojo { 15 namespace mojo {
16 class Shell; 16 class Shell;
17 }
18
19 namespace mus {
20 class View; 17 class View;
21 } 18 }
22 19
23 namespace mandoline { 20 namespace mandoline {
24 21
25 // Sets up necessary state for aura when run with the viewmanager. 22 // Sets up necessary state for aura when run with the viewmanager.
26 class AuraInit { 23 class AuraInit {
27 public: 24 public:
28 AuraInit(mus::View* root, mojo::Shell* shell); 25 AuraInit(mojo::View* root, mojo::Shell* shell);
29 ~AuraInit(); 26 ~AuraInit();
30 27
31 private: 28 private:
32 void InitializeResources(mojo::Shell* shell); 29 void InitializeResources(mojo::Shell* shell);
33 30
34 ui::mojo::UIInit ui_init_; 31 ui::mojo::UIInit ui_init_;
35 32
36 #if defined(OS_LINUX) && !defined(OS_ANDROID) 33 #if defined(OS_LINUX) && !defined(OS_ANDROID)
37 skia::RefPtr<font_service::FontLoader> font_loader_; 34 skia::RefPtr<font_service::FontLoader> font_loader_;
38 #endif 35 #endif
39 36
40 DISALLOW_COPY_AND_ASSIGN(AuraInit); 37 DISALLOW_COPY_AND_ASSIGN(AuraInit);
41 }; 38 };
42 39
43 } // namespace mandoline 40 } // namespace mandoline
44 41
45 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_ 42 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_
OLDNEW
« no previous file with comments | « mandoline/services/core_services/application_delegate_factory_notandroid.cc ('k') | mandoline/ui/aura/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698