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/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/stl_util.h" | 10 #include "base/stl_util.h" |
11 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "base/values.h" | 13 #include "base/values.h" |
14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
15 #include "chrome/browser/plugin_installer.h" | 15 #include "chrome/browser/plugins/plugin_installer.h" |
16 #include "chrome/browser/prefs/pref_service.h" | 16 #include "chrome/browser/prefs/pref_service.h" |
17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
18 #include "content/public/browser/browser_thread.h" | 18 #include "content/public/browser/browser_thread.h" |
19 #include "content/public/browser/plugin_service.h" | 19 #include "content/public/browser/plugin_service.h" |
20 #include "googleurl/src/gurl.h" | 20 #include "googleurl/src/gurl.h" |
21 #include "grit/browser_resources.h" | 21 #include "grit/browser_resources.h" |
22 #include "ui/base/layout.h" | 22 #include "ui/base/layout.h" |
23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
24 | 24 |
25 using base::DictionaryValue; | 25 using base::DictionaryValue; |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 // the name, identifier and group name only. | 290 // the name, identifier and group name only. |
291 std::string identifier = GetIdentifier(plugin); | 291 std::string identifier = GetIdentifier(plugin); |
292 PluginInstaller* installer = new PluginInstaller(identifier, | 292 PluginInstaller* installer = new PluginInstaller(identifier, |
293 GetGroupName(plugin), | 293 GetGroupName(plugin), |
294 false, GURL(), GURL(), | 294 false, GURL(), GURL(), |
295 GetGroupName(plugin)); | 295 GetGroupName(plugin)); |
296 installers_[identifier] = installer; | 296 installers_[identifier] = installer; |
297 name_installers_[plugin.name] = installer; | 297 name_installers_[plugin.name] = installer; |
298 return installer; | 298 return installer; |
299 } | 299 } |
OLD | NEW |