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

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

Issue 668663006: Standardize usage of virtual/override/final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « mojo/services/gles2/mojo_buffer_backing.h ('k') | mojo/services/html_viewer/html_viewer.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 MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ 5 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ 6 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 const blink::WebConsoleMessage& message, 79 const blink::WebConsoleMessage& message,
80 const blink::WebString& source_name, 80 const blink::WebString& source_name,
81 unsigned source_line, 81 unsigned source_line,
82 const blink::WebString& stack_trace); 82 const blink::WebString& stack_trace);
83 virtual void didNavigateWithinPage( 83 virtual void didNavigateWithinPage(
84 blink::WebLocalFrame* frame, 84 blink::WebLocalFrame* frame,
85 const blink::WebHistoryItem& history_item, 85 const blink::WebHistoryItem& history_item,
86 blink::WebHistoryCommitType commit_type); 86 blink::WebHistoryCommitType commit_type);
87 87
88 // ViewManagerDelegate methods: 88 // ViewManagerDelegate methods:
89 virtual void OnEmbed( 89 void OnEmbed(ViewManager* view_manager,
90 ViewManager* view_manager, 90 View* root,
91 View* root, 91 ServiceProviderImpl* embedee_service_provider_impl,
92 ServiceProviderImpl* embedee_service_provider_impl, 92 scoped_ptr<ServiceProvider> embedder_service_provider) override;
93 scoped_ptr<ServiceProvider> embedder_service_provider) override; 93 void OnViewManagerDisconnected(ViewManager* view_manager) override;
94 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
95 94
96 // ViewObserver methods: 95 // ViewObserver methods:
97 virtual void OnViewBoundsChanged(View* view, 96 void OnViewBoundsChanged(View* view,
98 const gfx::Rect& old_bounds, 97 const gfx::Rect& old_bounds,
99 const gfx::Rect& new_bounds) override; 98 const gfx::Rect& new_bounds) override;
100 virtual void OnViewDestroyed(View* view) override; 99 void OnViewDestroyed(View* view) override;
101 virtual void OnViewInputEvent(View* view, const EventPtr& event) override; 100 void OnViewInputEvent(View* view, const EventPtr& event) override;
102 101
103 void Load(URLResponsePtr response); 102 void Load(URLResponsePtr response);
104 103
105 URLResponsePtr response_; 104 URLResponsePtr response_;
106 scoped_ptr<ServiceProvider> embedder_service_provider_; 105 scoped_ptr<ServiceProvider> embedder_service_provider_;
107 Shell* shell_; 106 Shell* shell_;
108 LazyInterfacePtr<NavigatorHost> navigator_host_; 107 LazyInterfacePtr<NavigatorHost> navigator_host_;
109 blink::WebView* web_view_; 108 blink::WebView* web_view_;
110 View* root_; 109 View* root_;
111 ViewManagerClientFactory view_manager_client_factory_; 110 ViewManagerClientFactory view_manager_client_factory_;
112 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; 111 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
113 scoped_refptr<base::MessageLoopProxy> compositor_thread_; 112 scoped_refptr<base::MessageLoopProxy> compositor_thread_;
114 WebMediaPlayerFactory* web_media_player_factory_; 113 WebMediaPlayerFactory* web_media_player_factory_;
115 114
116 base::WeakPtrFactory<HTMLDocumentView> weak_factory_; 115 base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
117 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView); 116 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
118 }; 117 };
119 118
120 } // namespace mojo 119 } // namespace mojo
121 120
122 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ 121 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
OLDNEW
« no previous file with comments | « mojo/services/gles2/mojo_buffer_backing.h ('k') | mojo/services/html_viewer/html_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698