Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ | 5 #ifndef CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ |
| 6 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ | 6 #define CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 63 }; | 63 }; |
| 64 | 64 |
| 65 // RenderViewObserver implementation. | 65 // RenderViewObserver implementation. |
| 66 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; | 66 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; |
| 67 virtual void DidStartLoading() OVERRIDE; | 67 virtual void DidStartLoading() OVERRIDE; |
| 68 virtual void DidStopLoading() OVERRIDE; | 68 virtual void DidStopLoading() OVERRIDE; |
| 69 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, | 69 virtual void DidCommitProvisionalLoad(WebKit::WebFrame* frame, |
| 70 bool is_new_navigation) OVERRIDE; | 70 bool is_new_navigation) OVERRIDE; |
| 71 virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE; | 71 virtual void DidClearWindowObject(WebKit::WebFrame* frame) OVERRIDE; |
| 72 virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) OVERRIDE; | 72 virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) OVERRIDE; |
| 73 virtual void DidHandleGestureEvent(const WebKit::WebGestureEvent& event) | |
| 74 OVERRIDE; | |
|
jam
2012/12/17 22:51:09
nit: i believe the convention is that OVERRIDE sho
ananta
2012/12/17 22:59:06
Done.
| |
| 73 | 75 |
| 74 // WebKit::WebPermissionClient implementation. | 76 // WebKit::WebPermissionClient implementation. |
| 75 virtual bool allowDatabase(WebKit::WebFrame* frame, | 77 virtual bool allowDatabase(WebKit::WebFrame* frame, |
| 76 const WebKit::WebString& name, | 78 const WebKit::WebString& name, |
| 77 const WebKit::WebString& display_name, | 79 const WebKit::WebString& display_name, |
| 78 unsigned long estimated_size) OVERRIDE; | 80 unsigned long estimated_size) OVERRIDE; |
| 79 virtual bool allowFileSystem(WebKit::WebFrame* frame) OVERRIDE; | 81 virtual bool allowFileSystem(WebKit::WebFrame* frame) OVERRIDE; |
| 80 virtual bool allowImage(WebKit::WebFrame* frame, | 82 virtual bool allowImage(WebKit::WebFrame* frame, |
| 81 bool enabled_per_settings, | 83 bool enabled_per_settings, |
| 82 const WebKit::WebURL& image_url) OVERRIDE; | 84 const WebKit::WebURL& image_url) OVERRIDE; |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 // A color page overlay when visually de-emaphasized. | 197 // A color page overlay when visually de-emaphasized. |
| 196 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_; | 198 scoped_ptr<WebViewColorOverlay> dimmed_color_overlay_; |
| 197 | 199 |
| 198 // Used to delay calling CapturePageInfo. | 200 // Used to delay calling CapturePageInfo. |
| 199 base::Timer capture_timer_; | 201 base::Timer capture_timer_; |
| 200 | 202 |
| 201 DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver); | 203 DISALLOW_COPY_AND_ASSIGN(ChromeRenderViewObserver); |
| 202 }; | 204 }; |
| 203 | 205 |
| 204 #endif // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ | 206 #endif // CHROME_RENDERER_CHROME_RENDER_VIEW_OBSERVER_H_ |
| OLD | NEW |