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

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

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override 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/compiler_specific.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"
11 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" 11 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
13 #include "mojo/services/public/cpp/view_manager/view_observer.h" 13 #include "mojo/services/public/cpp/view_manager/view_observer.h"
14 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom. h" 14 #include "mojo/services/public/interfaces/content_handler/content_handler.mojom. h"
15 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" 15 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
16 #include "mojo/services/public/interfaces/network/url_loader.mojom.h" 16 #include "mojo/services/public/interfaces/network/url_loader.mojom.h"
17 #include "third_party/WebKit/public/web/WebFrameClient.h" 17 #include "third_party/WebKit/public/web/WebFrameClient.h"
18 #include "third_party/WebKit/public/web/WebViewClient.h" 18 #include "third_party/WebKit/public/web/WebViewClient.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 virtual void OnEmbed(
90 ViewManager* view_manager, 90 ViewManager* view_manager,
91 View* root, 91 View* root,
92 ServiceProviderImpl* embedee_service_provider_impl, 92 ServiceProviderImpl* embedee_service_provider_impl,
93 scoped_ptr<ServiceProvider> embedder_service_provider) OVERRIDE; 93 scoped_ptr<ServiceProvider> embedder_service_provider) override;
94 virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE; 94 virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
95 95
96 // ViewObserver methods: 96 // ViewObserver methods:
97 virtual void OnViewBoundsChanged(View* view, 97 virtual void OnViewBoundsChanged(View* view,
98 const gfx::Rect& old_bounds, 98 const gfx::Rect& old_bounds,
99 const gfx::Rect& new_bounds) OVERRIDE; 99 const gfx::Rect& new_bounds) override;
100 virtual void OnViewDestroyed(View* view) OVERRIDE; 100 virtual void OnViewDestroyed(View* view) override;
101 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE; 101 virtual void OnViewInputEvent(View* view, const EventPtr& event) override;
102 102
103 void Load(URLResponsePtr response); 103 void Load(URLResponsePtr response);
104 104
105 URLResponsePtr response_; 105 URLResponsePtr response_;
106 scoped_ptr<ServiceProvider> embedder_service_provider_; 106 scoped_ptr<ServiceProvider> embedder_service_provider_;
107 Shell* shell_; 107 Shell* shell_;
108 LazyInterfacePtr<NavigatorHost> navigator_host_; 108 LazyInterfacePtr<NavigatorHost> navigator_host_;
109 blink::WebView* web_view_; 109 blink::WebView* web_view_;
110 View* root_; 110 View* root_;
111 ViewManagerClientFactory view_manager_client_factory_; 111 ViewManagerClientFactory view_manager_client_factory_;
112 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_; 112 scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
113 scoped_refptr<base::MessageLoopProxy> compositor_thread_; 113 scoped_refptr<base::MessageLoopProxy> compositor_thread_;
114 WebMediaPlayerFactory* web_media_player_factory_; 114 WebMediaPlayerFactory* web_media_player_factory_;
115 115
116 base::WeakPtrFactory<HTMLDocumentView> weak_factory_; 116 base::WeakPtrFactory<HTMLDocumentView> weak_factory_;
117 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView); 117 DISALLOW_COPY_AND_ASSIGN(HTMLDocumentView);
118 }; 118 };
119 119
120 } // namespace mojo 120 } // namespace mojo
121 121
122 #endif // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_ 122 #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