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

Side by Side Diff: examples/wm_flow/wm/frame_controller.h

Issue 710203006: Reland: Remove aura and make a pure mojo::View version of FocusController. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Remove the offending lines. Created 6 years, 1 month 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 | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.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 EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 5 #ifndef EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
6 #define EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 6 #define EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "mojo/services/public/cpp/view_manager/view_observer.h" 9 #include "mojo/services/public/cpp/view_manager/view_observer.h"
10 #include "mojo/services/window_manager/focus_controller.h"
10 #include "ui/gfx/geometry/rect.h" 11 #include "ui/gfx/geometry/rect.h"
11 12
12 namespace aura {
13 namespace client {
14 class ActivationClient;
15 }
16 }
17
18 namespace mojo { 13 namespace mojo {
19 class NativeWidgetViewManager; 14 class NativeWidgetViewManager;
20 class Shell; 15 class Shell;
21 class View; 16 class View;
22 class WindowManagerApp; 17 class WindowManagerApp;
23 } 18 }
24 19
25 namespace views { 20 namespace views {
26 class View; 21 class View;
27 class Widget; 22 class Widget;
28 } 23 }
29 24
30 // FrameController encapsulates the window manager's frame additions to a window 25 // FrameController encapsulates the window manager's frame additions to a window
31 // created by an application. It renders the content of the frame and responds 26 // created by an application. It renders the content of the frame and responds
32 // to any events targeted at it. 27 // to any events targeted at it.
33 class FrameController : mojo::ViewObserver { 28 class FrameController : mojo::ViewObserver {
34 public: 29 public:
35 FrameController(mojo::Shell* shell, 30 FrameController(mojo::Shell* shell,
36 mojo::View* view, 31 mojo::View* view,
37 mojo::View** app_view, 32 mojo::View** app_view,
38 aura::client::ActivationClient* activation_client,
39 mojo::WindowManagerApp* window_manager_app); 33 mojo::WindowManagerApp* window_manager_app);
40 virtual ~FrameController(); 34 virtual ~FrameController();
41 35
42 void CloseWindow(); 36 void CloseWindow();
43 void ToggleMaximize(); 37 void ToggleMaximize();
44 38
45 void ActivateWindow(); 39 void ActivateWindow();
46 40
47 private: 41 private:
48 class LayoutManager; 42 class LayoutManager;
49 friend class LayoutManager; 43 friend class LayoutManager;
50 class FrameEventHandler; 44 class FrameEventHandler;
51 45
52 virtual void OnViewDestroyed(mojo::View* view) override; 46 virtual void OnViewDestroyed(mojo::View* view) override;
53 47
54 mojo::View* view_; 48 mojo::View* view_;
55 mojo::View* app_view_; 49 mojo::View* app_view_;
56 views::View* frame_view_; 50 views::View* frame_view_;
57 LayoutManager* frame_view_layout_manager_; 51 LayoutManager* frame_view_layout_manager_;
58 views::Widget* widget_; 52 views::Widget* widget_;
59 bool maximized_; 53 bool maximized_;
60 gfx::Rect restored_bounds_; 54 gfx::Rect restored_bounds_;
61 aura::client::ActivationClient* activation_client_;
62 mojo::WindowManagerApp* window_manager_app_; 55 mojo::WindowManagerApp* window_manager_app_;
63 scoped_ptr<FrameEventHandler> frame_event_handler_; 56 scoped_ptr<FrameEventHandler> frame_event_handler_;
64 57
65 DISALLOW_COPY_AND_ASSIGN(FrameController); 58 DISALLOW_COPY_AND_ASSIGN(FrameController);
66 }; 59 };
67 60
68 #endif // EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 61 #endif // EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
OLDNEW
« no previous file with comments | « examples/window_manager/window_manager.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698