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

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

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 UI_VIEWS_MUS_AURA_INIT_H_ 5 #ifndef UI_VIEWS_MUS_AURA_INIT_H_
6 #define UI_VIEWS_MUS_AURA_INIT_H_ 6 #define UI_VIEWS_MUS_AURA_INIT_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "skia/ext/refptr.h" 13 #include "skia/ext/refptr.h"
14 #include "ui/views/mus/mus_export.h" 14 #include "ui/views/mus/mus_export.h"
15 15
16 namespace aura { 16 namespace aura {
17 class Env; 17 class Env;
18 } 18 }
19 19
20 namespace font_service { 20 namespace font_service {
21 class FontLoader; 21 class FontLoader;
22 } 22 }
23 23
24 namespace mojo { 24 namespace shell {
25 class Connector; 25 class Connector;
26 } 26 }
27 27
28 namespace views { 28 namespace views {
29 class ViewsDelegate; 29 class ViewsDelegate;
30 30
31 // Sets up necessary state for aura when run with the viewmanager. 31 // Sets up necessary state for aura when run with the viewmanager.
32 // |resource_file| is the path to the apk file containing the resources. 32 // |resource_file| is the path to the apk file containing the resources.
33 class VIEWS_MUS_EXPORT AuraInit { 33 class VIEWS_MUS_EXPORT AuraInit {
34 public: 34 public:
35 AuraInit(mojo::Connector* connector, const std::string& resource_file); 35 AuraInit(shell::Connector* connector, const std::string& resource_file);
36 ~AuraInit(); 36 ~AuraInit();
37 37
38 private: 38 private:
39 void InitializeResources(mojo::Connector* connector); 39 void InitializeResources(shell::Connector* connector);
40 40
41 #if defined(OS_LINUX) && !defined(OS_ANDROID) 41 #if defined(OS_LINUX) && !defined(OS_ANDROID)
42 skia::RefPtr<font_service::FontLoader> font_loader_; 42 skia::RefPtr<font_service::FontLoader> font_loader_;
43 #endif 43 #endif
44 44
45 const std::string resource_file_; 45 const std::string resource_file_;
46 46
47 std::unique_ptr<aura::Env> env_; 47 std::unique_ptr<aura::Env> env_;
48 std::unique_ptr<ViewsDelegate> views_delegate_; 48 std::unique_ptr<ViewsDelegate> views_delegate_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(AuraInit); 50 DISALLOW_COPY_AND_ASSIGN(AuraInit);
51 }; 51 };
52 52
53 } // namespace views 53 } // namespace views
54 54
55 #endif // UI_VIEWS_MUS_AURA_INIT_H_ 55 #endif // UI_VIEWS_MUS_AURA_INIT_H_
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/harness-tests/mojo-helpers.html ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698