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

Side by Side Diff: webkit/plugins/npapi/webplugin_delegate_impl_win.cc

Issue 10823434: [6] Moves CreateVersionFromString to plugin_utils and updates the callers. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added missing include <algorithm> Created 8 years, 3 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 | « webkit/plugins/npapi/plugin_utils_unittest.cc ('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) 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 "webkit/plugins/npapi/webplugin_delegate_impl.h" 5 #include "webkit/plugins/npapi/webplugin_delegate_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 10 matching lines...) Expand all
21 #include "base/stringprintf.h" 21 #include "base/stringprintf.h"
22 #include "base/synchronization/lock.h" 22 #include "base/synchronization/lock.h"
23 #include "base/version.h" 23 #include "base/version.h"
24 #include "base/win/iat_patch_function.h" 24 #include "base/win/iat_patch_function.h"
25 #include "base/win/registry.h" 25 #include "base/win/registry.h"
26 #include "base/win/windows_version.h" 26 #include "base/win/windows_version.h"
27 #include "skia/ext/platform_canvas.h" 27 #include "skia/ext/platform_canvas.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
29 #include "webkit/glue/webkit_glue.h" 29 #include "webkit/glue/webkit_glue.h"
30 #include "webkit/plugins/npapi/plugin_constants_win.h" 30 #include "webkit/plugins/npapi/plugin_constants_win.h"
31 #include "webkit/plugins/npapi/plugin_group.h"
32 #include "webkit/plugins/npapi/plugin_instance.h" 31 #include "webkit/plugins/npapi/plugin_instance.h"
33 #include "webkit/plugins/npapi/plugin_lib.h" 32 #include "webkit/plugins/npapi/plugin_lib.h"
34 #include "webkit/plugins/npapi/plugin_list.h" 33 #include "webkit/plugins/npapi/plugin_list.h"
35 #include "webkit/plugins/npapi/plugin_stream_url.h" 34 #include "webkit/plugins/npapi/plugin_stream_url.h"
35 #include "webkit/plugins/npapi/plugin_utils.h"
36 #include "webkit/plugins/npapi/webplugin.h" 36 #include "webkit/plugins/npapi/webplugin.h"
37 #include "webkit/plugins/npapi/webplugin_ime_win.h" 37 #include "webkit/plugins/npapi/webplugin_ime_win.h"
38 38
39 using WebKit::WebCursorInfo; 39 using WebKit::WebCursorInfo;
40 using WebKit::WebKeyboardEvent; 40 using WebKit::WebKeyboardEvent;
41 using WebKit::WebInputEvent; 41 using WebKit::WebInputEvent;
42 using WebKit::WebMouseEvent; 42 using WebKit::WebMouseEvent;
43 43
44 namespace webkit { 44 namespace webkit {
45 namespace npapi { 45 namespace npapi {
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 if (result != STATUS_SUCCESS) 249 if (result != STATUS_SUCCESS)
250 return L""; 250 return L"";
251 251
252 KEY_NAME_INFORMATION* info = 252 KEY_NAME_INFORMATION* info =
253 reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get()); 253 reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get());
254 return std::wstring(info->Name, info->NameLength / sizeof(wchar_t)); 254 return std::wstring(info->Name, info->NameLength / sizeof(wchar_t));
255 } 255 }
256 256
257 int GetPluginMajorVersion(const WebPluginInfo& plugin_info) { 257 int GetPluginMajorVersion(const WebPluginInfo& plugin_info) {
258 Version plugin_version; 258 Version plugin_version;
259 PluginGroup::CreateVersionFromString(plugin_info.version, &plugin_version); 259 webkit::npapi::CreateVersionFromString(plugin_info.version, &plugin_version);
260 260
261 int major_version = 0; 261 int major_version = 0;
262 if (plugin_version.IsValid()) 262 if (plugin_version.IsValid())
263 major_version = plugin_version.components()[0]; 263 major_version = plugin_version.components()[0];
264 264
265 return major_version; 265 return major_version;
266 } 266 }
267 267
268 bool GetPluginPropertyFromWindow( 268 bool GetPluginPropertyFromWindow(
269 HWND window, const wchar_t* plugin_atom_property, 269 HWND window, const wchar_t* plugin_atom_property,
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1698 ::ReleaseCapture(); 1698 ::ReleaseCapture();
1699 break; 1699 break;
1700 1700
1701 default: 1701 default:
1702 break; 1702 break;
1703 } 1703 }
1704 } 1704 }
1705 1705
1706 } // namespace npapi 1706 } // namespace npapi
1707 } // namespace webkit 1707 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/npapi/plugin_utils_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698