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

Side by Side Diff: components/mus/example/common/mus_views_init.h

Issue 1402213002: Moves mandoline/ui/aura to ui/views/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable presubmit 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/views_delegate.h" 10 #include "ui/views/views_delegate.h"
11 11
12 namespace mandoline {
13 class AuraInit;
14 }
15
16 namespace mojo { 12 namespace mojo {
17 class ApplicationImpl; 13 class ApplicationImpl;
18 } 14 }
19 15
16 namespace views {
17 class AuraInit;
18 }
19
20 // Does the necessary setup to use mus, views and the example wm. 20 // Does the necessary setup to use mus, views and the example wm.
21 class MUSViewsInit : public views::ViewsDelegate, public mus::ViewTreeDelegate { 21 class MUSViewsInit : public views::ViewsDelegate, public mus::ViewTreeDelegate {
22 public: 22 public:
23 explicit MUSViewsInit(mojo::ApplicationImpl* app); 23 explicit MUSViewsInit(mojo::ApplicationImpl* app);
24 ~MUSViewsInit() override; 24 ~MUSViewsInit() override;
25 25
26 private: 26 private:
27 mus::View* CreateWindow(); 27 mus::View* CreateWindow();
28 28
29 // views::ViewsDelegate: 29 // views::ViewsDelegate:
30 views::NativeWidget* CreateNativeWidget( 30 views::NativeWidget* CreateNativeWidget(
31 views::internal::NativeWidgetDelegate* delegate) override; 31 views::internal::NativeWidgetDelegate* delegate) override;
32 void OnBeforeWidgetInit( 32 void OnBeforeWidgetInit(
33 views::Widget::InitParams* params, 33 views::Widget::InitParams* params,
34 views::internal::NativeWidgetDelegate* delegate) override; 34 views::internal::NativeWidgetDelegate* delegate) override;
35 35
36 // mus::ViewTreeDelegate: 36 // mus::ViewTreeDelegate:
37 void OnEmbed(mus::View* root) override; 37 void OnEmbed(mus::View* root) override;
38 void OnConnectionLost(mus::ViewTreeConnection* connection) override; 38 void OnConnectionLost(mus::ViewTreeConnection* connection) override;
39 #if defined(OS_WIN) 39 #if defined(OS_WIN)
40 HICON GetSmallWindowIcon() const override; 40 HICON GetSmallWindowIcon() const override;
41 #endif 41 #endif
42 42
43 mojo::ApplicationImpl* app_; 43 mojo::ApplicationImpl* app_;
44 44
45 scoped_ptr<mandoline::AuraInit> aura_init_; 45 scoped_ptr<views::AuraInit> aura_init_;
46 46
47 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit); 47 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
48 }; 48 };
49 49
50 #endif // COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_ 50 #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