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

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

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) Created 5 years, 11 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 | « examples/wm_flow/embedded/embedded.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 "examples/wm_flow/wm/window_frame_host.mojom.h" 9 #include "examples/wm_flow/wm/window_frame_host.mojom.h"
10 #include "mojo/public/cpp/application/interface_factory.h" 10 #include "mojo/public/cpp/application/interface_factory.h"
11 #include "mojo/public/cpp/application/service_provider_impl.h"
11 #include "mojo/services/view_manager/public/cpp/view_observer.h" 12 #include "mojo/services/view_manager/public/cpp/view_observer.h"
12 #include "services/window_manager/focus_controller.h" 13 #include "services/window_manager/focus_controller.h"
13 #include "ui/gfx/geometry/rect.h" 14 #include "ui/gfx/geometry/rect.h"
14 15
15 class GURL; 16 class GURL;
16 17
17 namespace mojo { 18 namespace mojo {
18 class NativeWidgetViewManager; 19 class NativeWidgetViewManager;
19 class View; 20 class View;
20 } 21 }
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 void OnViewDestroyed(mojo::View* view) override; 53 void OnViewDestroyed(mojo::View* view) override;
53 void OnViewBoundsChanged(mojo::View* view, 54 void OnViewBoundsChanged(mojo::View* view,
54 const mojo::Rect& old_bounds, 55 const mojo::Rect& old_bounds,
55 const mojo::Rect& new_bounds) override; 56 const mojo::Rect& new_bounds) override;
56 57
57 mojo::View* view_; 58 mojo::View* view_;
58 mojo::View* app_view_; 59 mojo::View* app_view_;
59 bool maximized_; 60 bool maximized_;
60 gfx::Rect restored_bounds_; 61 gfx::Rect restored_bounds_;
61 window_manager::WindowManagerApp* window_manager_app_; 62 window_manager::WindowManagerApp* window_manager_app_;
62 scoped_ptr<mojo::ServiceProvider> viewer_services_; 63 mojo::ServiceProviderImpl viewer_services_impl_;
63 64
64 mojo::Binding<examples::WindowFrameHost> binding_; 65 mojo::Binding<examples::WindowFrameHost> binding_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(FrameController); 67 DISALLOW_COPY_AND_ASSIGN(FrameController);
67 }; 68 };
68 69
69 #endif // EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_ 70 #endif // EXAMPLES_WM_FLOW_WM_FRAME_CONTROLLER_H_
OLDNEW
« no previous file with comments | « examples/wm_flow/embedded/embedded.cc ('k') | examples/wm_flow/wm/frame_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698