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

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

Issue 2361943002: Add 2x icons resources to mash. (Closed)
Patch Set: Use default arg. Created 4 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 | « ash/mus/window_manager_application.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 14 matching lines...) Expand all
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(shell::Connector* connector, const std::string& resource_file); 35 // |resource_file| is the file to load strings and 1x icons from.
36 // |resource_file_200| can be an empty string, otherwise it is the file to
37 // load 2x icons from.
38 AuraInit(shell::Connector* connector,
39 const std::string& resource_file,
40 const std::string& resource_file_200 = std::string());
41
36 ~AuraInit(); 42 ~AuraInit();
37 43
38 private: 44 private:
39 void InitializeResources(shell::Connector* connector); 45 void InitializeResources(shell::Connector* connector);
40 46
41 #if defined(OS_LINUX) 47 #if defined(OS_LINUX)
42 sk_sp<font_service::FontLoader> font_loader_; 48 sk_sp<font_service::FontLoader> font_loader_;
43 #endif 49 #endif
44 50
45 const std::string resource_file_; 51 const std::string resource_file_;
52 const std::string resource_file_200_;
46 53
47 std::unique_ptr<aura::Env> env_; 54 std::unique_ptr<aura::Env> env_;
48 std::unique_ptr<ViewsDelegate> views_delegate_; 55 std::unique_ptr<ViewsDelegate> views_delegate_;
49 56
50 DISALLOW_COPY_AND_ASSIGN(AuraInit); 57 DISALLOW_COPY_AND_ASSIGN(AuraInit);
51 }; 58 };
52 59
53 } // namespace views 60 } // namespace views
54 61
55 #endif // UI_VIEWS_MUS_AURA_INIT_H_ 62 #endif // UI_VIEWS_MUS_AURA_INIT_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698