| Index: mojo/services/html_viewer/html_document_view.h
|
| diff --git a/mojo/services/html_viewer/html_document_view.h b/mojo/services/html_viewer/html_document_view.h
|
| index 991ba43c2296b6f81a126189b2616090603d0228..e2407bd040c0e7b0ebe1d4fb4b09bc4dff9af8c9 100644
|
| --- a/mojo/services/html_viewer/html_document_view.h
|
| +++ b/mojo/services/html_viewer/html_document_view.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
|
| #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_VIEW_H_
|
|
|
| -#include "base/compiler_specific.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "mojo/public/cpp/application/lazy_interface_ptr.h"
|
| #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
|
| @@ -90,15 +90,15 @@ class HTMLDocumentView : public blink::WebViewClient,
|
| ViewManager* view_manager,
|
| View* root,
|
| ServiceProviderImpl* embedee_service_provider_impl,
|
| - scoped_ptr<ServiceProvider> embedder_service_provider) OVERRIDE;
|
| - virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE;
|
| + scoped_ptr<ServiceProvider> embedder_service_provider) override;
|
| + virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
|
|
|
| // ViewObserver methods:
|
| virtual void OnViewBoundsChanged(View* view,
|
| const gfx::Rect& old_bounds,
|
| - const gfx::Rect& new_bounds) OVERRIDE;
|
| - virtual void OnViewDestroyed(View* view) OVERRIDE;
|
| - virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE;
|
| + const gfx::Rect& new_bounds) override;
|
| + virtual void OnViewDestroyed(View* view) override;
|
| + virtual void OnViewInputEvent(View* view, const EventPtr& event) override;
|
|
|
| void Load(URLResponsePtr response);
|
|
|
|
|