| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/glue/plugins/plugin_group.h" | 5 #include "webkit/glue/plugins/plugin_group.h" |
| 6 | 6 |
| 7 #include "base/linked_ptr.h" | 7 #include "base/linked_ptr.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/sys_string_conversions.h" | 9 #include "base/sys_string_conversions.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 VersionRange::VersionRange(const VersionRange& other) { | 73 VersionRange::VersionRange(const VersionRange& other) { |
| 74 InitFrom(other); | 74 InitFrom(other); |
| 75 } | 75 } |
| 76 | 76 |
| 77 VersionRange& VersionRange::operator=(const VersionRange& other) { | 77 VersionRange& VersionRange::operator=(const VersionRange& other) { |
| 78 InitFrom(other); | 78 InitFrom(other); |
| 79 return *this; | 79 return *this; |
| 80 } | 80 } |
| 81 | 81 |
| 82 VersionRange::~VersionRange() {} |
| 83 |
| 82 void VersionRange::InitFrom(const VersionRange& other) { | 84 void VersionRange::InitFrom(const VersionRange& other) { |
| 83 low_str = other.low_str; | 85 low_str = other.low_str; |
| 84 high_str = other.high_str; | 86 high_str = other.high_str; |
| 85 min_str = other.min_str; | 87 min_str = other.min_str; |
| 86 low.reset(Version::GetVersionFromString(other.low_str)); | 88 low.reset(Version::GetVersionFromString(other.low_str)); |
| 87 high.reset(Version::GetVersionFromString(other.high_str)); | 89 high.reset(Version::GetVersionFromString(other.high_str)); |
| 88 min.reset(Version::GetVersionFromString(other.min_str)); | 90 min.reset(Version::GetVersionFromString(other.min_str)); |
| 89 } | 91 } |
| 90 | 92 |
| 91 PluginGroup::PluginGroup(const string16& group_name, | 93 PluginGroup::PluginGroup(const string16& group_name, |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 395 NPAPI::PluginList::Singleton()->EnablePlugin(it->path); | 397 NPAPI::PluginList::Singleton()->EnablePlugin(it->path); |
| 396 it->enabled = true; | 398 it->enabled = true; |
| 397 enabled_plugin_exists = true; | 399 enabled_plugin_exists = true; |
| 398 } else { | 400 } else { |
| 399 it->enabled = false; | 401 it->enabled = false; |
| 400 NPAPI::PluginList::Singleton()->DisablePlugin(it->path); | 402 NPAPI::PluginList::Singleton()->DisablePlugin(it->path); |
| 401 } | 403 } |
| 402 } | 404 } |
| 403 enabled_ = enabled_plugin_exists; | 405 enabled_ = enabled_plugin_exists; |
| 404 } | 406 } |
| OLD | NEW |