| 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 <algorithm> |
| 6 |
| 5 #include "webkit/plugins/npapi/plugin_group.h" | 7 #include "webkit/plugins/npapi/plugin_group.h" |
| 6 | 8 |
| 7 #include "base/linked_ptr.h" | 9 #include "base/linked_ptr.h" |
| 8 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 9 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 10 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 11 #include "base/values.h" | 13 #include "base/values.h" |
| 12 #include "base/version.h" | 14 #include "base/version.h" |
| 13 #include "webkit/plugins/npapi/plugin_list.h" | 15 #include "webkit/plugins/npapi/plugin_list.h" |
| 14 #include "webkit/plugins/npapi/webplugininfo.h" | 16 #include "webkit/plugins/npapi/webplugininfo.h" |
| (...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 // Only changeable if not managed. | 537 // Only changeable if not managed. |
| 536 if (plugin->enabled & WebPluginInfo::MANAGED_MASK) | 538 if (plugin->enabled & WebPluginInfo::MANAGED_MASK) |
| 537 return false; | 539 return false; |
| 538 plugin->enabled = new_reason; | 540 plugin->enabled = new_reason; |
| 539 } | 541 } |
| 540 return true; | 542 return true; |
| 541 } | 543 } |
| 542 | 544 |
| 543 } // namespace npapi | 545 } // namespace npapi |
| 544 } // namespace webkit | 546 } // namespace webkit |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6317016:
Change UTF8ToUTF16 to accept const StringPiece&. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src