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

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

Issue 12221144: Make zoom using ctrl+mouse wheel work in win aura. Windows -non-aura had a hack that was a layering… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 431
432 // RenderWidgetHostDelegate -------------------------------------------------- 432 // RenderWidgetHostDelegate --------------------------------------------------
433 433
434 virtual void RenderWidgetDeleted( 434 virtual void RenderWidgetDeleted(
435 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 435 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
436 virtual bool PreHandleKeyboardEvent( 436 virtual bool PreHandleKeyboardEvent(
437 const NativeWebKeyboardEvent& event, 437 const NativeWebKeyboardEvent& event,
438 bool* is_keyboard_shortcut) OVERRIDE; 438 bool* is_keyboard_shortcut) OVERRIDE;
439 virtual void HandleKeyboardEvent( 439 virtual void HandleKeyboardEvent(
440 const NativeWebKeyboardEvent& event) OVERRIDE; 440 const NativeWebKeyboardEvent& event) OVERRIDE;
441 virtual bool PreHandleWheelEvent(
442 const WebKit::WebMouseWheelEvent& event) OVERRIDE;
441 443
442 // RenderViewHostManager::Delegate ------------------------------------------- 444 // RenderViewHostManager::Delegate -------------------------------------------
443 445
444 virtual bool CreateRenderViewForRenderManager( 446 virtual bool CreateRenderViewForRenderManager(
445 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE; 447 RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;
446 virtual void BeforeUnloadFiredFromRenderManager( 448 virtual void BeforeUnloadFiredFromRenderManager(
447 bool proceed, const base::TimeTicks& proceed_time, 449 bool proceed, const base::TimeTicks& proceed_time,
448 bool* proceed_to_fire_unload) OVERRIDE; 450 bool* proceed_to_fire_unload) OVERRIDE;
449 virtual void RenderViewGoneFromRenderManager( 451 virtual void RenderViewGoneFromRenderManager(
450 RenderViewHost* render_view_host) OVERRIDE; 452 RenderViewHost* render_view_host) OVERRIDE;
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 // Maps the ids of pending favicon downloads to their callbacks 892 // Maps the ids of pending favicon downloads to their callbacks
891 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap; 893 typedef std::map<int, FaviconDownloadCallback> FaviconDownloadMap;
892 FaviconDownloadMap favicon_download_map_; 894 FaviconDownloadMap favicon_download_map_;
893 895
894 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 896 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
895 }; 897 };
896 898
897 } // namespace content 899 } // namespace content
898 900
899 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 901 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_win.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698