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

Side by Side Diff: content/plugin/webplugin_proxy.h

Issue 8898019: Remove Task inheritance from base::Timer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 9 years 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
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PLUGIN_WEBPLUGIN_PROXY_H_ 5 #ifndef CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
6 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ 6 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/hash_tables.h" 11 #include "base/hash_tables.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #if defined(OS_MACOSX) 13 #if defined(OS_MACOSX)
14 #include "base/mac/scoped_cftyperef.h" 14 #include "base/mac/scoped_cftyperef.h"
15 #endif 15 #endif
16 #include "base/memory/scoped_handle.h" 16 #include "base/memory/scoped_handle.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/memory/weak_ptr.h"
18 #include "base/shared_memory.h" 19 #include "base/shared_memory.h"
19 #include "base/timer.h" 20 #include "base/timer.h"
20 #include "googleurl/src/gurl.h" 21 #include "googleurl/src/gurl.h"
21 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
22 #if defined(USE_X11) 23 #if defined(USE_X11)
23 #include "ui/base/x/x11_util.h" 24 #include "ui/base/x/x11_util.h"
24 #endif 25 #endif
25 #include "ui/gfx/gl/gpu_preference.h" 26 #include "ui/gfx/gl/gpu_preference.h"
26 #include "ui/gfx/surface/transport_dib.h" 27 #include "ui/gfx/surface/transport_dib.h"
27 #include "webkit/plugins/npapi/webplugin.h" 28 #include "webkit/plugins/npapi/webplugin.h"
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 293
293 #endif 294 #endif
294 295
295 // Contains the routing id of the host render view. 296 // Contains the routing id of the host render view.
296 int host_render_view_routing_id_; 297 int host_render_view_routing_id_;
297 298
298 base::WeakPtrFactory<WebPluginProxy> weak_factory_; 299 base::WeakPtrFactory<WebPluginProxy> weak_factory_;
299 }; 300 };
300 301
301 #endif // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_ 302 #endif // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698