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 "chrome/browser/plugins/plugin_finder.h" | 5 #include "chrome/browser/plugins/plugin_finder.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/prefs/pref_registry_simple.h" |
| 11 #include "base/prefs/pref_service.h" |
10 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
11 #include "base/sys_string_conversions.h" | 13 #include "base/sys_string_conversions.h" |
12 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
13 #include "base/values.h" | 15 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/plugins/plugin_metadata.h" | 17 #include "chrome/browser/plugins/plugin_metadata.h" |
16 #include "chrome/browser/prefs/pref_registry_simple.h" | |
17 #include "chrome/browser/prefs/pref_service.h" | |
18 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
19 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
20 #include "content/public/browser/plugin_service.h" | 20 #include "content/public/browser/plugin_service.h" |
21 #include "googleurl/src/gurl.h" | 21 #include "googleurl/src/gurl.h" |
22 #include "grit/browser_resources.h" | 22 #include "grit/browser_resources.h" |
23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
24 | 24 |
25 #if defined(ENABLE_PLUGIN_INSTALLATION) | 25 #if defined(ENABLE_PLUGIN_INSTALLATION) |
26 #include "chrome/browser/plugins/plugin_installer.h" | 26 #include "chrome/browser/plugins/plugin_installer.h" |
27 #endif | 27 #endif |
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 DCHECK(!identifier_plugin_[identifier]); | 313 DCHECK(!identifier_plugin_[identifier]); |
314 identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin); | 314 identifier_plugin_[identifier] = CreatePluginMetadata(identifier, plugin); |
315 | 315 |
316 #if defined(ENABLE_PLUGIN_INSTALLATION) | 316 #if defined(ENABLE_PLUGIN_INSTALLATION) |
317 if (installers_.find(identifier) == installers_.end()) | 317 if (installers_.find(identifier) == installers_.end()) |
318 installers_[identifier] = new PluginInstaller(); | 318 installers_[identifier] = new PluginInstaller(); |
319 #endif | 319 #endif |
320 } | 320 } |
321 } | 321 } |
322 } | 322 } |
OLD | NEW |