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

Side by Side Diff: services/window_manager/window_manager_impl.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
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 SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_ 5 #ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
6 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_ 6 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "mojo/public/cpp/bindings/binding.h" 10 #include "mojo/public/cpp/bindings/binding.h"
(...skipping 20 matching lines...) Expand all
31 void NotifyWindowActivated(mojo::Id new_active_id, mojo::Id old_active_id); 31 void NotifyWindowActivated(mojo::Id new_active_id, mojo::Id old_active_id);
32 void NotifyCaptureChanged(mojo::Id new_capture_id, mojo::Id old_capture_id); 32 void NotifyCaptureChanged(mojo::Id new_capture_id, mojo::Id old_capture_id);
33 33
34 private: 34 private:
35 mojo::WindowManagerClient* client() { 35 mojo::WindowManagerClient* client() {
36 DCHECK(from_vm_); 36 DCHECK(from_vm_);
37 return binding_.client(); 37 return binding_.client();
38 } 38 }
39 39
40 // mojo::WindowManager: 40 // mojo::WindowManager:
41 void Embed( 41 void Embed(const mojo::String& url,
42 const mojo::String& url, 42 mojo::InterfaceRequest<mojo::ServiceProvider> services,
43 mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override; 43 mojo::ServiceProviderPtr exposed_services) override;
44 void SetCapture(uint32_t view_id, 44 void SetCapture(uint32_t view_id,
45 const mojo::Callback<void(bool)>& callback) override; 45 const mojo::Callback<void(bool)>& callback) override;
46 void FocusWindow(uint32_t view_id, 46 void FocusWindow(uint32_t view_id,
47 const mojo::Callback<void(bool)>& callback) override; 47 const mojo::Callback<void(bool)>& callback) override;
48 void ActivateWindow(uint32_t view_id, 48 void ActivateWindow(uint32_t view_id,
49 const mojo::Callback<void(bool)>& callback) override; 49 const mojo::Callback<void(bool)>& callback) override;
50 void GetFocusedAndActiveViews( 50 void GetFocusedAndActiveViews(
51 const mojo::Callback<void(uint32_t, uint32_t)>& callback) override; 51 const mojo::Callback<void(uint32_t, uint32_t)>& callback) override;
52 52
53 // mojo::ErrorHandler: 53 // mojo::ErrorHandler:
54 void OnConnectionError() override; 54 void OnConnectionError() override;
55 55
56 WindowManagerApp* window_manager_; 56 WindowManagerApp* window_manager_;
57 57
58 // Whether this connection originated from the ViewManager. Connections that 58 // Whether this connection originated from the ViewManager. Connections that
59 // originate from the view manager are expected to have clients. Connections 59 // originate from the view manager are expected to have clients. Connections
60 // that don't originate from the view manager do not have clients. 60 // that don't originate from the view manager do not have clients.
61 const bool from_vm_; 61 const bool from_vm_;
62 62
63 mojo::Binding<mojo::WindowManager> binding_; 63 mojo::Binding<mojo::WindowManager> binding_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl); 65 DISALLOW_COPY_AND_ASSIGN(WindowManagerImpl);
66 }; 66 };
67 67
68 } // namespace window_manager 68 } // namespace window_manager
69 69
70 #endif // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_ 70 #endif // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « services/window_manager/window_manager_delegate.h ('k') | services/window_manager/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698