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

Side by Side Diff: components/mus/example/common/mus_views_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 | « components/mus/example/common/BUILD.gn ('k') | components/mus/example/common/mus_views_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 COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 5 #ifndef COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
6 #define COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 6 #define COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "components/mus/public/cpp/view_tree_delegate.h" 9 #include "components/mus/public/cpp/view_tree_delegate.h"
10 #include "ui/views/mus/aura_init.h"
10 #include "ui/views/views_delegate.h" 11 #include "ui/views/views_delegate.h"
11 12
12 namespace mojo { 13 namespace mojo {
13 class ApplicationImpl; 14 class ApplicationImpl;
14 } 15 }
15 16
16 namespace views { 17 namespace views {
17 class AuraInit; 18 class AuraInit;
18 } 19 }
19 20
(...skipping 15 matching lines...) Expand all
35 36
36 // mus::ViewTreeDelegate: 37 // mus::ViewTreeDelegate:
37 void OnEmbed(mus::View* root) override; 38 void OnEmbed(mus::View* root) override;
38 void OnConnectionLost(mus::ViewTreeConnection* connection) override; 39 void OnConnectionLost(mus::ViewTreeConnection* connection) override;
39 #if defined(OS_WIN) 40 #if defined(OS_WIN)
40 HICON GetSmallWindowIcon() const override; 41 HICON GetSmallWindowIcon() const override;
41 #endif 42 #endif
42 43
43 mojo::ApplicationImpl* app_; 44 mojo::ApplicationImpl* app_;
44 45
45 scoped_ptr<views::AuraInit> aura_init_; 46 views::AuraInit aura_init_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit); 48 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
48 }; 49 };
49 50
50 #endif // COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 51 #endif // COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
OLDNEW
« no previous file with comments | « components/mus/example/common/BUILD.gn ('k') | components/mus/example/common/mus_views_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698