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/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" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 bool success = plugin_dict->GetString("url", &url); | 131 bool success = plugin_dict->GetString("url", &url); |
132 DCHECK(success); | 132 DCHECK(success); |
133 std::string help_url; | 133 std::string help_url; |
134 plugin_dict->GetString("help_url", &help_url); | 134 plugin_dict->GetString("help_url", &help_url); |
135 string16 name; | 135 string16 name; |
136 success = plugin_dict->GetString("name", &name); | 136 success = plugin_dict->GetString("name", &name); |
137 DCHECK(success); | 137 DCHECK(success); |
138 bool display_url = false; | 138 bool display_url = false; |
139 plugin_dict->GetBoolean("displayurl", &display_url); | 139 plugin_dict->GetBoolean("displayurl", &display_url); |
140 bool requires_authorization = true; | 140 bool requires_authorization = true; |
141 plugin_dict->GetBoolean("requires_authorization", &display_url); | 141 plugin_dict->GetBoolean("requires_authorization", &requires_authorization); |
142 PluginInstaller* installer = new PluginInstaller(identifier, | 142 PluginInstaller* installer = new PluginInstaller(identifier, |
143 GURL(url), | 143 GURL(url), |
144 GURL(help_url), | 144 GURL(help_url), |
145 name, | 145 name, |
146 display_url, | 146 display_url, |
147 requires_authorization); | 147 requires_authorization); |
148 installers_[identifier] = installer; | 148 installers_[identifier] = installer; |
149 return installer; | 149 return installer; |
150 } | 150 } |
OLD | NEW |