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

Side by Side Diff: content/renderer/npapi/webplugin_delegate_proxy.cc

Issue 109673004: Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the hea… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | extensions/browser/pending_extension_info.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 (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 #include "content/renderer/npapi/webplugin_delegate_proxy.h" 5 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #elif defined(USE_X11) 9 #elif defined(USE_X11)
10 #include <cairo/cairo.h> 10 #include <cairo/cairo.h>
11 #endif 11 #endif
12 12
13 #include <algorithm> 13 #include <algorithm>
14 14
15 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
16 #include "base/basictypes.h" 16 #include "base/basictypes.h"
17 #include "base/command_line.h" 17 #include "base/command_line.h"
18 #include "base/file_util.h" 18 #include "base/file_util.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/memory/ref_counted.h" 20 #include "base/memory/ref_counted.h"
21 #include "base/memory/scoped_ptr.h" 21 #include "base/memory/scoped_ptr.h"
22 #include "base/process/process.h" 22 #include "base/process/process.h"
23 #include "base/strings/string_split.h" 23 #include "base/strings/string_split.h"
24 #include "base/strings/string_util.h" 24 #include "base/strings/string_util.h"
25 #include "base/strings/utf_string_conversions.h" 25 #include "base/strings/utf_string_conversions.h"
26 #include "base/version.h"
26 #include "content/child/child_process.h" 27 #include "content/child/child_process.h"
27 #include "content/child/npapi/npobject_proxy.h" 28 #include "content/child/npapi/npobject_proxy.h"
28 #include "content/child/npapi/npobject_stub.h" 29 #include "content/child/npapi/npobject_stub.h"
29 #include "content/child/npapi/npobject_util.h" 30 #include "content/child/npapi/npobject_util.h"
30 #include "content/child/npapi/webplugin_resource_client.h" 31 #include "content/child/npapi/webplugin_resource_client.h"
31 #include "content/child/plugin_messages.h" 32 #include "content/child/plugin_messages.h"
32 #include "content/common/content_constants_internal.h" 33 #include "content/common/content_constants_internal.h"
33 #include "content/common/frame_messages.h" 34 #include "content/common/frame_messages.h"
34 #include "content/common/view_messages.h" 35 #include "content/common/view_messages.h"
35 #include "content/public/renderer/content_renderer_client.h" 36 #include "content/public/renderer/content_renderer_client.h"
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 1239
1239 plugin_->URLRedirectResponse(allow, resource_id); 1240 plugin_->URLRedirectResponse(allow, resource_id);
1240 } 1241 }
1241 1242
1242 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, 1243 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url,
1243 bool* result) { 1244 bool* result) {
1244 *result = plugin_->CheckIfRunInsecureContent(url); 1245 *result = plugin_->CheckIfRunInsecureContent(url);
1245 } 1246 }
1246 1247
1247 } // namespace content 1248 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | extensions/browser/pending_extension_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698