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

Side by Side Diff: ui/views/mus/aura_init.h

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit Created 5 years, 2 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
« no previous file with comments | « ui/views/mus/DEPS ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_VIEWS_MUS_AURA_INIT_H_
6 #define MANDOLINE_UI_AURA_AURA_INIT_H_ 6 #define UI_VIEWS_MUS_AURA_INIT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "skia/ext/refptr.h" 10 #include "skia/ext/refptr.h"
11 #include "ui/mojo/init/ui_init.h" 11 #include "ui/mojo/init/ui_init.h"
12 12
13 namespace font_service { 13 namespace font_service {
14 class FontLoader; 14 class FontLoader;
15 } 15 }
16 16
17 namespace mojo { 17 namespace mojo {
18 class Shell; 18 class Shell;
19 } 19 }
20 20
21 namespace mus { 21 namespace mus {
22 class View; 22 class View;
23 } 23 }
24 24
25 namespace mandoline { 25 namespace views {
26 26
27 // Sets up necessary state for aura when run with the viewmanager. 27 // Sets up necessary state for aura when run with the viewmanager.
28 // TODO(sky): move this out of mandoline.
29 // |resource_file| is the path to the apk file containing the resources. 28 // |resource_file| is the path to the apk file containing the resources.
30 class AuraInit { 29 class AuraInit {
31 public: 30 public:
32 AuraInit(mus::View* root, 31 AuraInit(mus::View* root,
33 mojo::Shell* shell, 32 mojo::Shell* shell,
34 const std::string& resource_file); 33 const std::string& resource_file);
35 ~AuraInit(); 34 ~AuraInit();
36 35
37 private: 36 private:
38 void InitializeResources(mojo::Shell* shell); 37 void InitializeResources(mojo::Shell* shell);
39 38
40 ui::mojo::UIInit ui_init_; 39 ui::mojo::UIInit ui_init_;
41 40
42 #if defined(OS_LINUX) && !defined(OS_ANDROID) 41 #if defined(OS_LINUX) && !defined(OS_ANDROID)
43 skia::RefPtr<font_service::FontLoader> font_loader_; 42 skia::RefPtr<font_service::FontLoader> font_loader_;
44 #endif 43 #endif
45 44
46 const std::string resource_file_; 45 const std::string resource_file_;
47 46
48 DISALLOW_COPY_AND_ASSIGN(AuraInit); 47 DISALLOW_COPY_AND_ASSIGN(AuraInit);
49 }; 48 };
50 49
51 } // namespace mandoline 50 } // namespace views
52 51
53 #endif // MANDOLINE_UI_AURA_AURA_INIT_H_ 52 #endif // UI_VIEWS_MUS_AURA_INIT_H_
OLDNEW
« no previous file with comments | « ui/views/mus/DEPS ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698