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

Side by Side Diff: mojo/services/html_viewer/html_document.h

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC 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 MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ 5 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ 6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 const blink::WebString& source_name, 98 const blink::WebString& source_name,
99 unsigned source_line, 99 unsigned source_line,
100 const blink::WebString& stack_trace); 100 const blink::WebString& stack_trace);
101 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame, 101 virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
102 const blink::WebHistoryItem& history_item, 102 const blink::WebHistoryItem& history_item,
103 blink::WebHistoryCommitType commit_type); 103 blink::WebHistoryCommitType commit_type);
104 virtual blink::WebEncryptedMediaClient* encryptedMediaClient(); 104 virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
105 105
106 // ViewManagerDelegate methods: 106 // ViewManagerDelegate methods:
107 void OnEmbed( 107 void OnEmbed(
108 mojo::ViewManager* view_manager,
109 mojo::View* root, 108 mojo::View* root,
110 mojo::ServiceProviderImpl* embedee_service_provider_impl, 109 mojo::ServiceProviderImpl* embedee_service_provider_impl,
111 scoped_ptr<mojo::ServiceProvider> embedder_service_provider) override; 110 scoped_ptr<mojo::ServiceProvider> embedder_service_provider) override;
112 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; 111 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
113 112
114 // ViewObserver methods: 113 // ViewObserver methods:
115 void OnViewBoundsChanged(mojo::View* view, 114 void OnViewBoundsChanged(mojo::View* view,
116 const mojo::Rect& old_bounds, 115 const mojo::Rect& old_bounds,
117 const mojo::Rect& new_bounds) override; 116 const mojo::Rect& new_bounds) override;
118 void OnViewDestroyed(mojo::View* view) override; 117 void OnViewDestroyed(mojo::View* view) override;
(...skipping 22 matching lines...) Expand all
141 140
142 // HTMLDocument owns these pointers. 141 // HTMLDocument owns these pointers.
143 std::set<AxProviderImpl*> ax_provider_impls_; 142 std::set<AxProviderImpl*> ax_provider_impls_;
144 143
145 DISALLOW_COPY_AND_ASSIGN(HTMLDocument); 144 DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
146 }; 145 };
147 146
148 } // namespace html_viewer 147 } // namespace html_viewer
149 148
150 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_ 149 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
OLDNEW
« no previous file with comments | « mojo/public/tools/bindings/pylib/mojom_tests/generate/module_unittest.py ('k') | mojo/services/html_viewer/html_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698