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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 287093002: Remove ViewMsg_SetZoomLevel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update temporary zoom settings in OnDocumentAvailableInMainFrame Created 6 years, 7 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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 virtual const std::string& GetContentsMimeType() const OVERRIDE; 270 virtual const std::string& GetContentsMimeType() const OVERRIDE;
271 virtual bool WillNotifyDisconnection() const OVERRIDE; 271 virtual bool WillNotifyDisconnection() const OVERRIDE;
272 virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE; 272 virtual void SetOverrideEncoding(const std::string& encoding) OVERRIDE;
273 virtual void ResetOverrideEncoding() OVERRIDE; 273 virtual void ResetOverrideEncoding() OVERRIDE;
274 virtual RendererPreferences* GetMutableRendererPrefs() OVERRIDE; 274 virtual RendererPreferences* GetMutableRendererPrefs() OVERRIDE;
275 virtual void Close() OVERRIDE; 275 virtual void Close() OVERRIDE;
276 virtual void SystemDragEnded() OVERRIDE; 276 virtual void SystemDragEnded() OVERRIDE;
277 virtual void UserGestureDone() OVERRIDE; 277 virtual void UserGestureDone() OVERRIDE;
278 virtual void SetClosedByUserGesture(bool value) OVERRIDE; 278 virtual void SetClosedByUserGesture(bool value) OVERRIDE;
279 virtual bool GetClosedByUserGesture() const OVERRIDE; 279 virtual bool GetClosedByUserGesture() const OVERRIDE;
280 virtual double GetZoomLevel() const OVERRIDE;
281 virtual int GetZoomPercent(bool* enable_increment, 280 virtual int GetZoomPercent(bool* enable_increment,
282 bool* enable_decrement) const OVERRIDE; 281 bool* enable_decrement) const OVERRIDE;
283 virtual void ViewSource() OVERRIDE; 282 virtual void ViewSource() OVERRIDE;
284 virtual void ViewFrameSource(const GURL& url, 283 virtual void ViewFrameSource(const GURL& url,
285 const PageState& page_state) OVERRIDE; 284 const PageState& page_state) OVERRIDE;
286 virtual int GetMinimumZoomPercent() const OVERRIDE; 285 virtual int GetMinimumZoomPercent() const OVERRIDE;
287 virtual int GetMaximumZoomPercent() const OVERRIDE; 286 virtual int GetMaximumZoomPercent() const OVERRIDE;
288 virtual gfx::Size GetPreferredSize() const OVERRIDE; 287 virtual gfx::Size GetPreferredSize() const OVERRIDE;
289 virtual bool GotResponseToLockMouseRequest(bool allowed) OVERRIDE; 288 virtual bool GotResponseToLockMouseRequest(bool allowed) OVERRIDE;
290 virtual bool HasOpener() const OVERRIDE; 289 virtual bool HasOpener() const OVERRIDE;
291 virtual void DidChooseColorInColorChooser(SkColor color) OVERRIDE; 290 virtual void DidChooseColorInColorChooser(SkColor color) OVERRIDE;
292 virtual void DidEndColorChooser() OVERRIDE; 291 virtual void DidEndColorChooser() OVERRIDE;
293 virtual int DownloadImage(const GURL& url, 292 virtual int DownloadImage(const GURL& url,
294 bool is_favicon, 293 bool is_favicon,
295 uint32_t max_bitmap_size, 294 uint32_t max_bitmap_size,
296 const ImageDownloadCallback& callback) OVERRIDE; 295 const ImageDownloadCallback& callback) OVERRIDE;
297 virtual bool IsSubframe() const OVERRIDE; 296 virtual bool IsSubframe() const OVERRIDE;
298 virtual void Find(int request_id, 297 virtual void Find(int request_id,
299 const base::string16& search_text, 298 const base::string16& search_text,
300 const blink::WebFindOptions& options) OVERRIDE; 299 const blink::WebFindOptions& options) OVERRIDE;
301 virtual void SetZoomLevel(double level) OVERRIDE;
302 virtual void StopFinding(StopFindAction action) OVERRIDE; 300 virtual void StopFinding(StopFindAction action) OVERRIDE;
303 virtual void InsertCSS(const std::string& css) OVERRIDE; 301 virtual void InsertCSS(const std::string& css) OVERRIDE;
304 #if defined(OS_ANDROID) 302 #if defined(OS_ANDROID)
305 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() 303 virtual base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents()
306 OVERRIDE; 304 OVERRIDE;
307 #elif defined(OS_MACOSX) 305 #elif defined(OS_MACOSX)
308 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE; 306 virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
309 virtual bool GetAllowOverlappingViews() OVERRIDE; 307 virtual bool GetAllowOverlappingViews() OVERRIDE;
310 virtual void SetOverlayView(WebContents* overlay, 308 virtual void SetOverlayView(WebContents* overlay,
311 const gfx::Point& offset) OVERRIDE; 309 const gfx::Point& offset) OVERRIDE;
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 void OnDidDisplayInsecureContent(); 696 void OnDidDisplayInsecureContent();
699 void OnDidRunInsecureContent(const std::string& security_origin, 697 void OnDidRunInsecureContent(const std::string& security_origin,
700 const GURL& target_url); 698 const GURL& target_url);
701 void OnDocumentLoadedInFrame(); 699 void OnDocumentLoadedInFrame();
702 void OnDidFinishLoad(const GURL& url); 700 void OnDidFinishLoad(const GURL& url);
703 void OnDidStartLoading(bool to_different_document); 701 void OnDidStartLoading(bool to_different_document);
704 void OnDidStopLoading(); 702 void OnDidStopLoading();
705 void OnDidChangeLoadProgress(double load_progress); 703 void OnDidChangeLoadProgress(double load_progress);
706 void OnGoToEntryAtOffset(int offset); 704 void OnGoToEntryAtOffset(int offset);
707 void OnUpdateZoomLimits(int minimum_percent, 705 void OnUpdateZoomLimits(int minimum_percent,
708 int maximum_percent, 706 int maximum_percent);
709 bool remember);
710 void OnEnumerateDirectory(int request_id, const base::FilePath& path); 707 void OnEnumerateDirectory(int request_id, const base::FilePath& path);
711 708
712 void OnRegisterProtocolHandler(const std::string& protocol, 709 void OnRegisterProtocolHandler(const std::string& protocol,
713 const GURL& url, 710 const GURL& url,
714 const base::string16& title, 711 const base::string16& title,
715 bool user_gesture); 712 bool user_gesture);
716 void OnFindReply(int request_id, 713 void OnFindReply(int request_id,
717 int number_of_matches, 714 int number_of_matches,
718 const gfx::Rect& selection_rect, 715 const gfx::Rect& selection_rect,
719 int active_match_ordinal, 716 int active_match_ordinal,
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
1032 // The time that this WebContents was last made active. The initial value is 1029 // The time that this WebContents was last made active. The initial value is
1033 // the WebContents creation time. 1030 // the WebContents creation time.
1034 base::TimeTicks last_active_time_; 1031 base::TimeTicks last_active_time_;
1035 1032
1036 // See description above setter. 1033 // See description above setter.
1037 bool closed_by_user_gesture_; 1034 bool closed_by_user_gesture_;
1038 1035
1039 // Minimum/maximum zoom percent. 1036 // Minimum/maximum zoom percent.
1040 int minimum_zoom_percent_; 1037 int minimum_zoom_percent_;
1041 int maximum_zoom_percent_; 1038 int maximum_zoom_percent_;
1042 // If true, the default zoom limits have been overriden for this tab, in which
1043 // case we don't want saved settings to apply to it and we don't want to
1044 // remember it.
1045 bool temporary_zoom_settings_;
1046 1039
1047 // The raw accumulated zoom value and the actual zoom increments made for an 1040 // The raw accumulated zoom value and the actual zoom increments made for an
1048 // an in-progress pinch gesture. 1041 // an in-progress pinch gesture.
1049 float totalPinchGestureAmount_; 1042 float totalPinchGestureAmount_;
1050 int currentPinchZoomStepDelta_; 1043 int currentPinchZoomStepDelta_;
1051 1044
1052 // The intrinsic size of the page. 1045 // The intrinsic size of the page.
1053 gfx::Size preferred_size_; 1046 gfx::Size preferred_size_;
1054 1047
1055 // The preferred size for content screen capture. When |capturer_count_| > 0, 1048 // The preferred size for content screen capture. When |capturer_count_| > 0,
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 bool last_dialog_suppressed_; 1117 bool last_dialog_suppressed_;
1125 1118
1126 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_; 1119 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;
1127 1120
1128 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1121 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1129 }; 1122 };
1130 1123
1131 } // namespace content 1124 } // namespace content
1132 1125
1133 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1126 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698