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

Side by Side 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 unified diff | 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 »
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 <string> 8 #include <string>
9 #include <vector>
9 10
10 #include "skia/ext/refptr.h" 11 #include "skia/ext/refptr.h"
11 #include "ui/mojo/init/ui_init.h" 12 #include "ui/mojo/init/ui_init.h"
12 13
13 namespace font_service { 14 namespace font_service {
14 class FontLoader; 15 class FontLoader;
15 } 16 }
16 17
18 namespace gfx {
19 class Display;
20 }
21
17 namespace mojo { 22 namespace mojo {
18 class Shell; 23 class ApplicationImpl;
19 } 24 }
20 25
21 namespace mus { 26 namespace mus {
22 class View; 27 class View;
23 } 28 }
24 29
25 namespace views { 30 namespace views {
26 31
27 // Sets up necessary state for aura when run with the viewmanager. 32 // Sets up necessary state for aura when run with the viewmanager.
28 // |resource_file| is the path to the apk file containing the resources. 33 // |resource_file| is the path to the apk file containing the resources.
29 class AuraInit { 34 class AuraInit {
30 public: 35 public:
31 AuraInit(mus::View* root, 36 // This constructor builds the set of Displays from the ViewportMetrics of
32 mojo::Shell* shell, 37 // |view|.
33 const std::string& resource_file); 38 AuraInit(mojo::ApplicationImpl* app,
39 const std::string& resource_file,
40 mus::View* view);
41 AuraInit(mojo::ApplicationImpl* app,
42 const std::string& resource_file,
43 const std::vector<gfx::Display>& displays);
34 ~AuraInit(); 44 ~AuraInit();
35 45
36 private: 46 private:
37 void InitializeResources(mojo::Shell* shell); 47 void InitializeResources(mojo::ApplicationImpl* app);
38 48
39 ui::mojo::UIInit ui_init_; 49 ui::mojo::UIInit ui_init_;
40 50
41 #if defined(OS_LINUX) && !defined(OS_ANDROID) 51 #if defined(OS_LINUX) && !defined(OS_ANDROID)
42 skia::RefPtr<font_service::FontLoader> font_loader_; 52 skia::RefPtr<font_service::FontLoader> font_loader_;
43 #endif 53 #endif
44 54
45 const std::string resource_file_; 55 const std::string resource_file_;
46 56
47 DISALLOW_COPY_AND_ASSIGN(AuraInit); 57 DISALLOW_COPY_AND_ASSIGN(AuraInit);
48 }; 58 };
49 59
50 } // namespace views 60 } // namespace views
51 61
52 #endif // UI_VIEWS_MUS_AURA_INIT_H_ 62 #endif // UI_VIEWS_MUS_AURA_INIT_H_
OLDNEW
« 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