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

Side by Side Diff: android_webview/renderer/aw_render_view_ext.h

Issue 16932006: [Android WebView] Fix LoadsImagesAutomatically tests after crbug.com/224317 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restored WebPermissionClient inheritance Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
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 ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ 5 #ifndef ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_
6 #define ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ 6 #define ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "content/public/renderer/render_view_observer.h" 10 #include "content/public/renderer/render_view_observer.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 void OnDoHitTest(int view_x, int view_y); 43 void OnDoHitTest(int view_x, int view_y);
44 44
45 void OnSetTextZoomLevel(double zoom_level); 45 void OnSetTextZoomLevel(double zoom_level);
46 46
47 void OnResetScrollAndScaleState(); 47 void OnResetScrollAndScaleState();
48 48
49 void OnSetInitialPageScale(double page_scale_factor); 49 void OnSetInitialPageScale(double page_scale_factor);
50 50
51 void UpdatePageScaleFactor(); 51 void UpdatePageScaleFactor();
52 52
53 // WebKit::WebPermissionClient implementation.
54 virtual bool allowImage(WebKit::WebFrame* frame,
55 bool enabledPerSettings,
56 const WebKit::WebURL& imageURL) OVERRIDE;
57
58 bool capture_picture_enabled_; 53 bool capture_picture_enabled_;
59 54
60 float page_scale_factor_; 55 float page_scale_factor_;
61 56
62 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt); 57 DISALLOW_COPY_AND_ASSIGN(AwRenderViewExt);
63 }; 58 };
64 59
65 } // namespace android_webview 60 } // namespace android_webview
66 61
67 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_ 62 #endif // ANDROID_WEBVIEW_RENDERER_AW_RENDER_VIEW_EXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698