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

Side by Side Diff: content/renderer/render_view_impl.h

Issue 954923005: Make command-zero reset page scale in addition to zoom level (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase again again Created 5 years, 9 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 | « content/public/browser/web_contents.h ('k') | content/renderer/render_view_impl.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 (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 CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 const blink::WebRect& touch_rect, 392 const blink::WebRect& touch_rect,
393 const blink::WebVector<blink::WebRect>& target_rects); 393 const blink::WebVector<blink::WebRect>& target_rects);
394 #endif 394 #endif
395 virtual blink::WebString acceptLanguages(); 395 virtual blink::WebString acceptLanguages();
396 virtual void navigateBackForwardSoon(int offset); 396 virtual void navigateBackForwardSoon(int offset);
397 virtual int historyBackListCount(); 397 virtual int historyBackListCount();
398 virtual int historyForwardListCount(); 398 virtual int historyForwardListCount();
399 virtual blink::WebSpeechRecognizer* speechRecognizer(); 399 virtual blink::WebSpeechRecognizer* speechRecognizer();
400 virtual void zoomLimitsChanged(double minimum_level, double maximum_level); 400 virtual void zoomLimitsChanged(double minimum_level, double maximum_level);
401 virtual void zoomLevelChanged(); 401 virtual void zoomLevelChanged();
402 virtual void pageScaleFactorChanged();
402 virtual double zoomLevelToZoomFactor(double zoom_level) const; 403 virtual double zoomLevelToZoomFactor(double zoom_level) const;
403 virtual double zoomFactorToZoomLevel(double factor) const; 404 virtual double zoomFactorToZoomLevel(double factor) const;
404 virtual void registerProtocolHandler(const blink::WebString& scheme, 405 virtual void registerProtocolHandler(const blink::WebString& scheme,
405 const blink::WebURL& url, 406 const blink::WebURL& url,
406 const blink::WebString& title); 407 const blink::WebString& title);
407 virtual void unregisterProtocolHandler(const blink::WebString& scheme, 408 virtual void unregisterProtocolHandler(const blink::WebString& scheme,
408 const blink::WebURL& url); 409 const blink::WebURL& url);
409 virtual blink::WebPageVisibilityState visibilityState() const; 410 virtual blink::WebPageVisibilityState visibilityState() const;
410 virtual void draggableRegionsChanged(); 411 virtual void draggableRegionsChanged();
411 412
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 void OnSetPageEncoding(const std::string& encoding_name); 671 void OnSetPageEncoding(const std::string& encoding_name);
671 void OnSetRendererPrefs(const RendererPreferences& renderer_prefs); 672 void OnSetRendererPrefs(const RendererPreferences& renderer_prefs);
672 void OnSetWebUIProperty(const std::string& name, const std::string& value); 673 void OnSetWebUIProperty(const std::string& name, const std::string& value);
673 void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level); 674 void OnSetZoomLevelForLoadingURL(const GURL& url, double zoom_level);
674 void OnSetZoomLevelForView(bool uses_temporary_zoom_level, double level); 675 void OnSetZoomLevelForView(bool uses_temporary_zoom_level, double level);
675 void OnStopFinding(StopFindAction action); 676 void OnStopFinding(StopFindAction action);
676 void OnSuppressDialogsUntilSwapOut(); 677 void OnSuppressDialogsUntilSwapOut();
677 void OnThemeChanged(); 678 void OnThemeChanged();
678 void OnUpdateTargetURLAck(); 679 void OnUpdateTargetURLAck();
679 void OnUpdateWebPreferences(const WebPreferences& prefs); 680 void OnUpdateWebPreferences(const WebPreferences& prefs);
681 void OnResetPageScale();
680 void OnZoom(PageZoom zoom); 682 void OnZoom(PageZoom zoom);
681 void OnEnableViewSourceMode(); 683 void OnEnableViewSourceMode();
682 void OnWindowSnapshotCompleted(const int snapshot_id, 684 void OnWindowSnapshotCompleted(const int snapshot_id,
683 const gfx::Size& size, const std::vector<unsigned char>& png); 685 const gfx::Size& size, const std::vector<unsigned char>& png);
684 void OnForceRedraw(int request_id); 686 void OnForceRedraw(int request_id);
685 void OnSelectWordAroundCaret(); 687 void OnSelectWordAroundCaret();
686 #if defined(OS_ANDROID) 688 #if defined(OS_ANDROID)
687 void OnActivateNearestFindResult(int request_id, float x, float y); 689 void OnActivateNearestFindResult(int request_id, float x, float y);
688 void OnFindMatchRects(int current_version); 690 void OnFindMatchRects(int current_version);
689 void OnUndoScrollFocusedEditableNodeIntoRect(); 691 void OnUndoScrollFocusedEditableNodeIntoRect();
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 // session, this info is sent to the browser along with other drag/drop info. 1032 // session, this info is sent to the browser along with other drag/drop info.
1031 DragEventSourceInfo possible_drag_event_info_; 1033 DragEventSourceInfo possible_drag_event_info_;
1032 1034
1033 // NOTE: stats_collection_observer_ should be the last members because their 1035 // NOTE: stats_collection_observer_ should be the last members because their
1034 // constructors call the AddObservers method of RenderViewImpl. 1036 // constructors call the AddObservers method of RenderViewImpl.
1035 scoped_ptr<StatsCollectionObserver> stats_collection_observer_; 1037 scoped_ptr<StatsCollectionObserver> stats_collection_observer_;
1036 1038
1037 typedef std::map<cc::SharedBitmapId, cc::SharedBitmap*> BitmapMap; 1039 typedef std::map<cc::SharedBitmapId, cc::SharedBitmap*> BitmapMap;
1038 BitmapMap disambiguation_bitmaps_; 1040 BitmapMap disambiguation_bitmaps_;
1039 1041
1042 bool page_scale_factor_is_one_;
1043
1040 // --------------------------------------------------------------------------- 1044 // ---------------------------------------------------------------------------
1041 // ADDING NEW DATA? Please see if it fits appropriately in one of the above 1045 // ADDING NEW DATA? Please see if it fits appropriately in one of the above
1042 // sections rather than throwing it randomly at the end. If you're adding a 1046 // sections rather than throwing it randomly at the end. If you're adding a
1043 // bunch of stuff, you should probably create a helper class and put your 1047 // bunch of stuff, you should probably create a helper class and put your
1044 // data and methods on that to avoid bloating RenderView more. You can 1048 // data and methods on that to avoid bloating RenderView more. You can
1045 // use the Observer interface to filter IPC messages and receive frame change 1049 // use the Observer interface to filter IPC messages and receive frame change
1046 // notifications. 1050 // notifications.
1047 // --------------------------------------------------------------------------- 1051 // ---------------------------------------------------------------------------
1048 1052
1049 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl); 1053 DISALLOW_COPY_AND_ASSIGN(RenderViewImpl);
1050 }; 1054 };
1051 1055
1052 } // namespace content 1056 } // namespace content
1053 1057
1054 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_ 1058 #endif // CONTENT_RENDERER_RENDER_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/browser/web_contents.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698