| 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/file_util.h" |    8 #include "base/file_util.h" | 
|    9 #include "base/path_service.h" |    9 #include "base/path_service.h" | 
|   10 #include "base/process_util.h" |   10 #include "base/process_util.h" | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  372  |  372  | 
|  373 void ChromeContentClient::AddNPAPIPlugins( |  373 void ChromeContentClient::AddNPAPIPlugins( | 
|  374     webkit::npapi::PluginList* plugin_list) { |  374     webkit::npapi::PluginList* plugin_list) { | 
|  375 } |  375 } | 
|  376  |  376  | 
|  377 void ChromeContentClient::AddAdditionalSchemes( |  377 void ChromeContentClient::AddAdditionalSchemes( | 
|  378     std::vector<std::string>* standard_schemes, |  378     std::vector<std::string>* standard_schemes, | 
|  379     std::vector<std::string>* savable_schemes) { |  379     std::vector<std::string>* savable_schemes) { | 
|  380   standard_schemes->push_back(kExtensionScheme); |  380   standard_schemes->push_back(kExtensionScheme); | 
|  381   savable_schemes->push_back(kExtensionScheme); |  381   savable_schemes->push_back(kExtensionScheme); | 
 |  382   standard_schemes->push_back(kExtensionResourceScheme); | 
 |  383   savable_schemes->push_back(kExtensionResourceScheme); | 
|  382 #if defined(OS_CHROMEOS) |  384 #if defined(OS_CHROMEOS) | 
|  383   standard_schemes->push_back(kCrosScheme); |  385   standard_schemes->push_back(kCrosScheme); | 
|  384 #endif |  386 #endif | 
|  385 } |  387 } | 
|  386  |  388  | 
|  387 bool ChromeContentClient::HasWebUIScheme(const GURL& url) const { |  389 bool ChromeContentClient::HasWebUIScheme(const GURL& url) const { | 
|  388   return url.SchemeIs(chrome::kChromeDevToolsScheme) || |  390   return url.SchemeIs(chrome::kChromeDevToolsScheme) || | 
|  389          url.SchemeIs(chrome::kChromeInternalScheme) || |  391          url.SchemeIs(chrome::kChromeInternalScheme) || | 
|  390          url.SchemeIs(chrome::kChromeUIScheme); |  392          url.SchemeIs(chrome::kChromeUIScheme); | 
|  391 } |  393 } | 
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  506  |  508  | 
|  507 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( |  509 bool ChromeContentClient::GetBundledFieldTrialPepperFlash( | 
|  508     content::PepperPluginInfo* plugin, |  510     content::PepperPluginInfo* plugin, | 
|  509     bool* override_npapi_flash) { |  511     bool* override_npapi_flash) { | 
|  510   if (!ConductingPepperFlashFieldTrial()) |  512   if (!ConductingPepperFlashFieldTrial()) | 
|  511     return false; |  513     return false; | 
|  512   return GetBundledPepperFlash(plugin, override_npapi_flash); |  514   return GetBundledPepperFlash(plugin, override_npapi_flash); | 
|  513 } |  515 } | 
|  514  |  516  | 
|  515 }  // namespace chrome |  517 }  // namespace chrome | 
| OLD | NEW |