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

Unified Diff: ui/views/mus/aura_init.h

Issue 2361943002: Add 2x icons resources to mash. (Closed)
Patch Set: Use default arg. Created 4 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/aura_init.h
diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h
index d76827668e79b75dcd135ca18426a20e99c62d17..ac828327e98c1a76f45b146cf6ac6a5572fa64cb 100644
--- a/ui/views/mus/aura_init.h
+++ b/ui/views/mus/aura_init.h
@@ -32,7 +32,13 @@ class ViewsDelegate;
// |resource_file| is the path to the apk file containing the resources.
class VIEWS_MUS_EXPORT AuraInit {
public:
- AuraInit(shell::Connector* connector, const std::string& resource_file);
+ // |resource_file| is the file to load strings and 1x icons from.
+ // |resource_file_200| can be an empty string, otherwise it is the file to
+ // load 2x icons from.
+ AuraInit(shell::Connector* connector,
+ const std::string& resource_file,
+ const std::string& resource_file_200 = std::string());
+
~AuraInit();
private:
@@ -43,6 +49,7 @@ class VIEWS_MUS_EXPORT AuraInit {
#endif
const std::string resource_file_;
+ const std::string resource_file_200_;
std::unique_ptr<aura::Env> env_;
std::unique_ptr<ViewsDelegate> views_delegate_;
« 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