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

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

Issue 617503003: Mojo: MOJO_OVERRIDE -> override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 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 | « mojo/examples/wm_flow/init/init.cc ('k') | mojo/examples/wm_flow/wm/wm.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 MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 5 #ifndef MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
6 #define MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 6 #define MOJO_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 "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
(...skipping 29 matching lines...) Expand all
40 void CloseWindow(); 40 void CloseWindow();
41 void ToggleMaximize(); 41 void ToggleMaximize();
42 42
43 void ActivateWindow(); 43 void ActivateWindow();
44 44
45 private: 45 private:
46 class LayoutManager; 46 class LayoutManager;
47 friend class LayoutManager; 47 friend class LayoutManager;
48 class FrameEventHandler; 48 class FrameEventHandler;
49 49
50 virtual void OnViewDestroyed(mojo::View* view) MOJO_OVERRIDE; 50 virtual void OnViewDestroyed(mojo::View* view) override;
51 51
52 mojo::View* view_; 52 mojo::View* view_;
53 mojo::View* app_view_; 53 mojo::View* app_view_;
54 views::View* frame_view_; 54 views::View* frame_view_;
55 LayoutManager* frame_view_layout_manager_; 55 LayoutManager* frame_view_layout_manager_;
56 views::Widget* widget_; 56 views::Widget* widget_;
57 bool maximized_; 57 bool maximized_;
58 gfx::Rect restored_bounds_; 58 gfx::Rect restored_bounds_;
59 aura::client::ActivationClient* activation_client_; 59 aura::client::ActivationClient* activation_client_;
60 mojo::WindowManagerApp* window_manager_app_; 60 mojo::WindowManagerApp* window_manager_app_;
61 scoped_ptr<FrameEventHandler> frame_event_handler_; 61 scoped_ptr<FrameEventHandler> frame_event_handler_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(FrameController); 63 DISALLOW_COPY_AND_ASSIGN(FrameController);
64 }; 64 };
65 65
66 #endif // MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 66 #endif // MOJO_EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
OLDNEW
« no previous file with comments | « mojo/examples/wm_flow/init/init.cc ('k') | mojo/examples/wm_flow/wm/wm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698