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

Side by Side Diff: sky/tools/debugger/debugger.h

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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 | « services/window_manager/window_manager_app.cc ('k') | sky/tools/debugger/debugger.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 #include "base/memory/weak_ptr.h" 5 #include "base/memory/weak_ptr.h"
6 #include "mojo/public/cpp/application/application_delegate.h" 6 #include "mojo/public/cpp/application/application_delegate.h"
7 #include "mojo/public/cpp/application/application_impl.h" 7 #include "mojo/public/cpp/application/application_impl.h"
8 #include "mojo/public/cpp/application/connect.h" 8 #include "mojo/public/cpp/application/connect.h"
9 #include "mojo/public/cpp/application/service_provider_impl.h" 9 #include "mojo/public/cpp/application/service_provider_impl.h"
10 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h" 10 #include "mojo/services/input_events/public/interfaces/input_events.mojom.h"
(...skipping 28 matching lines...) Expand all
39 39
40 private: 40 private:
41 // Overridden from mojo::ApplicationDelegate: 41 // Overridden from mojo::ApplicationDelegate:
42 void Initialize(mojo::ApplicationImpl* app) override; 42 void Initialize(mojo::ApplicationImpl* app) override;
43 bool ConfigureIncomingConnection( 43 bool ConfigureIncomingConnection(
44 mojo::ApplicationConnection* connection) override; 44 mojo::ApplicationConnection* connection) override;
45 bool ConfigureOutgoingConnection( 45 bool ConfigureOutgoingConnection(
46 mojo::ApplicationConnection* connection) override; 46 mojo::ApplicationConnection* connection) override;
47 47
48 // Overridden from mojo::ViewManagerDelegate: 48 // Overridden from mojo::ViewManagerDelegate:
49 void OnEmbed(mojo::ViewManager* view_manager, 49 void OnEmbed(mojo::View* root,
50 mojo::View* root,
51 mojo::ServiceProviderImpl* exported_services, 50 mojo::ServiceProviderImpl* exported_services,
52 scoped_ptr<mojo::ServiceProvider> imported_services) override; 51 scoped_ptr<mojo::ServiceProvider> imported_services) override;
53 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; 52 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
54 53
55 // Overriden from mojo::ViewObserver: 54 // Overriden from mojo::ViewObserver:
56 void OnViewDestroyed(mojo::View* view) override; 55 void OnViewDestroyed(mojo::View* view) override;
57 void OnViewBoundsChanged(mojo::View* view, 56 void OnViewBoundsChanged(mojo::View* view,
58 const mojo::Rect& old_bounds, 57 const mojo::Rect& old_bounds,
59 const mojo::Rect& new_bounds) override; 58 const mojo::Rect& new_bounds) override;
60 59
61 // Overridden from InterfaceFactory<Debugger>: 60 // Overridden from InterfaceFactory<Debugger>:
62 void Create(mojo::ApplicationConnection* connection, 61 void Create(mojo::ApplicationConnection* connection,
63 mojo::InterfaceRequest<Debugger> request) override; 62 mojo::InterfaceRequest<Debugger> request) override;
64 63
65 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; 64 scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
66 65
67 mojo::ViewManager* view_manager_;
68 mojo::View* root_; 66 mojo::View* root_;
69 mojo::View* content_; 67 mojo::View* content_;
70 std::string pending_url_; 68 std::string pending_url_;
71 69
72 scoped_ptr<mojo::ServiceProvider> viewer_services_; 70 scoped_ptr<mojo::ServiceProvider> viewer_services_;
73 71
74 NavigatorHostFactory navigator_host_factory_; 72 NavigatorHostFactory navigator_host_factory_;
75 73
76 base::WeakPtrFactory<SkyDebugger> weak_factory_; 74 base::WeakPtrFactory<SkyDebugger> weak_factory_;
77 75
78 DISALLOW_COPY_AND_ASSIGN(SkyDebugger); 76 DISALLOW_COPY_AND_ASSIGN(SkyDebugger);
79 }; 77 };
80 78
81 } // namespace debugger 79 } // namespace debugger
82 } // namespace sky 80 } // namespace sky
OLDNEW
« no previous file with comments | « services/window_manager/window_manager_app.cc ('k') | sky/tools/debugger/debugger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698