Chromium Code Reviews| 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/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/cpu.h" | 8 #include "base/cpu.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 166 static bool skip_nacl_file_check = false; | 166 static bool skip_nacl_file_check = false; |
| 167 if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) { | 167 if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) { |
| 168 if (skip_nacl_file_check || base::PathExists(path)) { | 168 if (skip_nacl_file_check || base::PathExists(path)) { |
| 169 content::PepperPluginInfo nacl; | 169 content::PepperPluginInfo nacl; |
| 170 nacl.path = path; | 170 nacl.path = path; |
| 171 nacl.name = chrome::ChromeContentClient::kNaClPluginName; | 171 nacl.name = chrome::ChromeContentClient::kNaClPluginName; |
| 172 webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType, | 172 webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType, |
| 173 kNaClPluginExtension, | 173 kNaClPluginExtension, |
| 174 kNaClPluginDescription); | 174 kNaClPluginDescription); |
| 175 nacl.mime_types.push_back(nacl_mime_type); | 175 nacl.mime_types.push_back(nacl_mime_type); |
| 176 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnablePnacl)) { | 176 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 177 switches::kDisablePnacl)) { | |
|
Mark Seaborn
2013/07/18 01:25:52
Indent by 4 more chars. Should be indented as:
/
sehr
2013/07/22 23:06:50
vim's auto indent disagrees with you, but done.
O
| |
| 177 webkit::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType, | 178 webkit::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType, |
| 178 kPnaclPluginExtension, | 179 kPnaclPluginExtension, |
| 179 kPnaclPluginDescription); | 180 kPnaclPluginDescription); |
| 180 nacl.mime_types.push_back(pnacl_mime_type); | 181 nacl.mime_types.push_back(pnacl_mime_type); |
| 181 } | 182 } |
| 182 nacl.permissions = kNaClPluginPermissions; | 183 nacl.permissions = kNaClPluginPermissions; |
| 183 plugins->push_back(nacl); | 184 plugins->push_back(nacl); |
| 184 | 185 |
| 185 skip_nacl_file_check = true; | 186 skip_nacl_file_check = true; |
| 186 } | 187 } |
| (...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 490 } | 491 } |
| 491 return false; | 492 return false; |
| 492 } | 493 } |
| 493 | 494 |
| 494 std::string ChromeContentClient::GetCarbonInterposePath() const { | 495 std::string ChromeContentClient::GetCarbonInterposePath() const { |
| 495 return std::string(kInterposeLibraryPath); | 496 return std::string(kInterposeLibraryPath); |
| 496 } | 497 } |
| 497 #endif | 498 #endif |
| 498 | 499 |
| 499 } // namespace chrome | 500 } // namespace chrome |
| OLD | NEW |