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

Side by Side Diff: ui/views/mus/native_widget_view_manager.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 | « ui/views/mus/input_method_mus.cc ('k') | ui/views/mus/native_widget_view_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ 5 #ifndef UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
6 #define MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ 6 #define UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
7 7
8 #include "ui/views/widget/native_widget_aura.h" 8 #include "ui/views/widget/native_widget_aura.h"
9 9
10 namespace aura { 10 namespace aura {
11 namespace client { 11 namespace client {
12 class DefaultCaptureClient; 12 class DefaultCaptureClient;
13 } 13 }
14 } 14 }
15 15
16 namespace mojo {
17 class Shell;
18 }
19
20 namespace mus {
21 class View;
22 }
23
16 namespace ui { 24 namespace ui {
17 namespace internal { 25 namespace internal {
18 class InputMethodDelegate; 26 class InputMethodDelegate;
19 } 27 }
20 } 28 }
21 29
22 namespace wm { 30 namespace wm {
23 class FocusController; 31 class FocusController;
24 } 32 }
25 33
26 namespace mojo { 34 namespace views {
27 class Shell;
28 }
29
30 namespace mus {
31 class View;
32 }
33
34 namespace mandoline {
35 35
36 namespace { 36 namespace {
37 class NativeWidgetViewObserver; 37 class NativeWidgetViewObserver;
38 } 38 }
39 39
40 class WindowTreeHostMojo; 40 class WindowTreeHostMojo;
41 41
42 class NativeWidgetViewManager : public views::NativeWidgetAura { 42 class NativeWidgetViewManager : public views::NativeWidgetAura {
43 public: 43 public:
44 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate, 44 NativeWidgetViewManager(views::internal::NativeWidgetDelegate* delegate,
(...skipping 13 matching lines...) Expand all
58 58
59 scoped_ptr<wm::FocusController> focus_client_; 59 scoped_ptr<wm::FocusController> focus_client_;
60 60
61 mus::View* view_; 61 mus::View* view_;
62 62
63 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; 63 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager); 65 DISALLOW_COPY_AND_ASSIGN(NativeWidgetViewManager);
66 }; 66 };
67 67
68 } // namespace mandoline 68 } // namespace views
69 69
70 #endif // MANDOLINE_UI_AURA_NATIVE_WIDGET_VIEW_MANAGER_H_ 70 #endif // UI_VIEWS_MUS_NATIVE_WIDGET_VIEW_MANAGER_H_
OLDNEW
« no previous file with comments | « ui/views/mus/input_method_mus.cc ('k') | ui/views/mus/native_widget_view_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698