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

Side by Side Diff: content/renderer/input/input_handler_manager.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
« no previous file with comments | « content/common/gpu/gpu_channel_manager.h ('k') | content/test/mock_webblob_registry_impl.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_INPUT_INPUT_HANDLER_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 6 #define CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const scoped_refptr<base::MessageLoopProxy>& main_loop, 87 const scoped_refptr<base::MessageLoopProxy>& main_loop,
88 const base::WeakPtr<cc::InputHandler>& input_handler, 88 const base::WeakPtr<cc::InputHandler>& input_handler,
89 const base::WeakPtr<RenderViewImpl>& render_view_impl); 89 const base::WeakPtr<RenderViewImpl>& render_view_impl);
90 90
91 void ObserveWheelEventAndResultOnCompositorThread( 91 void ObserveWheelEventAndResultOnCompositorThread(
92 int routing_id, 92 int routing_id,
93 const blink::WebMouseWheelEvent& wheel_event, 93 const blink::WebMouseWheelEvent& wheel_event,
94 const cc::InputHandlerScrollResult& scroll_result); 94 const cc::InputHandlerScrollResult& scroll_result);
95 95
96 typedef base::ScopedPtrHashMap<int, // routing_id 96 typedef base::ScopedPtrHashMap<int, // routing_id
97 InputHandlerWrapper> InputHandlerMap; 97 scoped_ptr<InputHandlerWrapper>>
98 InputHandlerMap;
98 InputHandlerMap input_handlers_; 99 InputHandlerMap input_handlers_;
99 100
100 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 101 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
101 InputHandlerManagerClient* client_; 102 InputHandlerManagerClient* client_;
102 scheduler::RendererScheduler* renderer_scheduler_; // Not owned. 103 scheduler::RendererScheduler* renderer_scheduler_; // Not owned.
103 }; 104 };
104 105
105 } // namespace content 106 } // namespace content
106 107
107 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_ 108 #endif // CONTENT_RENDERER_INPUT_INPUT_HANDLER_MANAGER_H_
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_channel_manager.h ('k') | content/test/mock_webblob_registry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698