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

Side by Side Diff: sky/viewer/document_view.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 | « sky/tools/tester/tester.cc ('k') | sky/viewer/document_view.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 SKY_VIEWER_DOCUMENT_VIEW_H_ 5 #ifndef SKY_VIEWER_DOCUMENT_VIEW_H_
6 #define SKY_VIEWER_DOCUMENT_VIEW_H_ 6 #define SKY_VIEWER_DOCUMENT_VIEW_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "mojo/public/cpp/application/lazy_interface_ptr.h" 10 #include "mojo/public/cpp/application/lazy_interface_ptr.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 // WebViewClient methods: 94 // WebViewClient methods:
95 blink::ServiceProvider& services() override; 95 blink::ServiceProvider& services() override;
96 96
97 // Services methods: 97 // Services methods:
98 mojo::NavigatorHost* NavigatorHost() override; 98 mojo::NavigatorHost* NavigatorHost() override;
99 mojo::Shell* Shell() override; 99 mojo::Shell* Shell() override;
100 100
101 // ViewManagerDelegate methods: 101 // ViewManagerDelegate methods:
102 void OnEmbed( 102 void OnEmbed(
103 mojo::ViewManager* view_manager,
104 mojo::View* root, 103 mojo::View* root,
105 mojo::ServiceProviderImpl* exported_services, 104 mojo::ServiceProviderImpl* exported_services,
106 scoped_ptr<mojo::ServiceProvider> imported_services) override; 105 scoped_ptr<mojo::ServiceProvider> imported_services) override;
107 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; 106 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
108 107
109 // ViewObserver methods: 108 // ViewObserver methods:
110 void OnViewBoundsChanged(mojo::View* view, 109 void OnViewBoundsChanged(mojo::View* view,
111 const mojo::Rect& old_bounds, 110 const mojo::Rect& old_bounds,
112 const mojo::Rect& new_bounds) override; 111 const mojo::Rect& new_bounds) override;
113 void OnViewFocusChanged(mojo::View* gained_focus, 112 void OnViewFocusChanged(mojo::View* gained_focus,
(...skipping 19 matching lines...) Expand all
133 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_; 132 scoped_ptr<inspector::InspectorBackendMojo> inspector_backend_;
134 base::WeakPtrFactory<DocumentView> weak_factory_; 133 base::WeakPtrFactory<DocumentView> weak_factory_;
135 int debugger_id_; 134 int debugger_id_;
136 135
137 DISALLOW_COPY_AND_ASSIGN(DocumentView); 136 DISALLOW_COPY_AND_ASSIGN(DocumentView);
138 }; 137 };
139 138
140 } // namespace sky 139 } // namespace sky
141 140
142 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_ 141 #endif // SKY_VIEWER_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « sky/tools/tester/tester.cc ('k') | sky/viewer/document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698