OLD | NEW |
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 <windows.h> | 5 #include <windows.h> |
6 | 6 |
7 #include "chrome/browser/hang_monitor/hung_plugin_action.h" | 7 #include "chrome/browser/hang_monitor/hung_plugin_action.h" |
8 | 8 |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 GTALK_PLUGIN_VERSION_34, | 33 GTALK_PLUGIN_VERSION_34, |
34 GTALK_PLUGIN_VERSION_MAX | 34 GTALK_PLUGIN_VERSION_MAX |
35 }; | 35 }; |
36 | 36 |
37 // Converts the version string of Google Talk Plugin to a version enum. The | 37 // Converts the version string of Google Talk Plugin to a version enum. The |
38 // version format is "major(1 digit).minor(1 digit).sub(1 or 2 digits)", | 38 // version format is "major(1 digit).minor(1 digit).sub(1 or 2 digits)", |
39 // for example, "2.7.10" and "2.8.1". Converts the string to a number as | 39 // for example, "2.7.10" and "2.8.1". Converts the string to a number as |
40 // 10 * major + minor - kGTalkPluginLogMinVersion. | 40 // 10 * major + minor - kGTalkPluginLogMinVersion. |
41 GTalkPluginLogVersion GetGTalkPluginVersion(const base::string16& version) { | 41 GTalkPluginLogVersion GetGTalkPluginVersion(const base::string16& version) { |
42 int gtalk_plugin_version = GTALK_PLUGIN_VERSION_MIN; | 42 int gtalk_plugin_version = GTALK_PLUGIN_VERSION_MIN; |
43 base::Version plugin_version; | 43 Version plugin_version; |
44 content::WebPluginInfo::CreateVersionFromString(version, &plugin_version); | 44 content::WebPluginInfo::CreateVersionFromString(version, &plugin_version); |
45 if (plugin_version.IsValid() && plugin_version.components().size() >= 2) { | 45 if (plugin_version.IsValid() && plugin_version.components().size() >= 2) { |
46 gtalk_plugin_version = 10 * plugin_version.components()[0] + | 46 gtalk_plugin_version = 10 * plugin_version.components()[0] + |
47 plugin_version.components()[1] - kGTalkPluginLogMinVersion; | 47 plugin_version.components()[1] - kGTalkPluginLogMinVersion; |
48 } | 48 } |
49 | 49 |
50 if (gtalk_plugin_version < GTALK_PLUGIN_VERSION_MIN) | 50 if (gtalk_plugin_version < GTALK_PLUGIN_VERSION_MIN) |
51 return GTALK_PLUGIN_VERSION_MIN; | 51 return GTALK_PLUGIN_VERSION_MIN; |
52 if (gtalk_plugin_version > GTALK_PLUGIN_VERSION_MAX) | 52 if (gtalk_plugin_version > GTALK_PLUGIN_VERSION_MAX) |
53 return GTALK_PLUGIN_VERSION_MAX; | 53 return GTALK_PLUGIN_VERSION_MAX; |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window, | 175 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window, |
176 UINT message, | 176 UINT message, |
177 ULONG_PTR data, | 177 ULONG_PTR data, |
178 LRESULT result) { | 178 LRESULT result) { |
179 HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data); | 179 HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data); |
180 DCHECK(NULL != instance); | 180 DCHECK(NULL != instance); |
181 if (NULL != instance) { | 181 if (NULL != instance) { |
182 instance->OnWindowResponsive(target_window); | 182 instance->OnWindowResponsive(target_window); |
183 } | 183 } |
184 } | 184 } |
OLD | NEW |