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

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

Issue 1407073002: Adds GetDisplays() to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/mojo/init/ui_init.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 319a9c33370ab92b6b0ddabee888a76ce7fb65b0..5b37a55a01d753dbd8b3b6bae2a04d18312c3781 100644
--- a/ui/views/mus/aura_init.h
+++ b/ui/views/mus/aura_init.h
@@ -6,6 +6,7 @@
#define UI_VIEWS_MUS_AURA_INIT_H_
#include <string>
+#include <vector>
#include "skia/ext/refptr.h"
#include "ui/mojo/init/ui_init.h"
@@ -14,8 +15,12 @@ namespace font_service {
class FontLoader;
}
+namespace gfx {
+class Display;
+}
+
namespace mojo {
-class Shell;
+class ApplicationImpl;
}
namespace mus {
@@ -28,13 +33,18 @@ namespace views {
// |resource_file| is the path to the apk file containing the resources.
class AuraInit {
public:
- AuraInit(mus::View* root,
- mojo::Shell* shell,
- const std::string& resource_file);
+ // This constructor builds the set of Displays from the ViewportMetrics of
+ // |view|.
+ AuraInit(mojo::ApplicationImpl* app,
+ const std::string& resource_file,
+ mus::View* view);
+ AuraInit(mojo::ApplicationImpl* app,
+ const std::string& resource_file,
+ const std::vector<gfx::Display>& displays);
~AuraInit();
private:
- void InitializeResources(mojo::Shell* shell);
+ void InitializeResources(mojo::ApplicationImpl* app);
ui::mojo::UIInit ui_init_;
« no previous file with comments | « ui/mojo/init/ui_init.cc ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698