| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/mac/bundle_locations.h" | 7 #include "base/mac/bundle_locations.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "content/shell/app/blink_test_platform_support.h" | 10 #include "content/shell/app/blink_test_platform_support.h" |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 &errors)) { | 80 &errors)) { |
| 81 DLOG(FATAL) << "Fail to activate fonts."; | 81 DLOG(FATAL) << "Fail to activate fonts."; |
| 82 CFRelease(errors); | 82 CFRelease(errors); |
| 83 } | 83 } |
| 84 | 84 |
| 85 // Add <app bundle's parent dir>/plugins to the plugin path so we can load | 85 // Add <app bundle's parent dir>/plugins to the plugin path so we can load |
| 86 // test plugins. | 86 // test plugins. |
| 87 base::FilePath plugins_dir; | 87 base::FilePath plugins_dir; |
| 88 PathService::Get(base::DIR_EXE, &plugins_dir); | 88 PathService::Get(base::DIR_EXE, &plugins_dir); |
| 89 plugins_dir = plugins_dir.AppendASCII("../../../plugins"); | 89 plugins_dir = plugins_dir.AppendASCII("../../../plugins"); |
| 90 CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 90 base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); |
| 91 command_line.AppendSwitchPath(switches::kExtraPluginDir, plugins_dir); | 91 command_line.AppendSwitchPath(switches::kExtraPluginDir, plugins_dir); |
| 92 | 92 |
| 93 return true; | 93 return true; |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace | 96 } // namespace |
| OLD | NEW |