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 2174983002: OS_LINUX and OS_ANDROID are mutually exclusive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « services/shell/runner/host/child_process_host.cc ('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 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
(...skipping 20 matching lines...) Expand all
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(shell::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(shell::Connector* connector); 39 void InitializeResources(shell::Connector* connector);
40 40
41 #if defined(OS_LINUX) && !defined(OS_ANDROID) 41 #if defined(OS_LINUX)
42 sk_sp<font_service::FontLoader> font_loader_; 42 sk_sp<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 | « services/shell/runner/host/child_process_host.cc ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698