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 <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <tuple> | 10 #include <tuple> |
11 | 11 |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/debug/crash_logging.h" | 13 #include "base/debug/crash_logging.h" |
14 #include "base/files/file_util.h" | 14 #include "base/files/file_util.h" |
15 #include "base/json/json_reader.h" | 15 #include "base/json/json_reader.h" |
| 16 #include "base/memory/ptr_util.h" |
16 #include "base/memory/scoped_vector.h" | 17 #include "base/memory/scoped_vector.h" |
17 #include "base/native_library.h" | 18 #include "base/native_library.h" |
18 #include "base/path_service.h" | 19 #include "base/path_service.h" |
19 #include "base/strings/string16.h" | 20 #include "base/strings/string16.h" |
20 #include "base/strings/string_number_conversions.h" | 21 #include "base/strings/string_number_conversions.h" |
21 #include "base/strings/string_split.h" | 22 #include "base/strings/string_split.h" |
22 #include "base/strings/string_util.h" | 23 #include "base/strings/string_util.h" |
23 #include "base/strings/stringprintf.h" | 24 #include "base/strings/stringprintf.h" |
24 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
25 #include "build/build_config.h" | 26 #include "build/build_config.h" |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
711 origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); | 712 origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); |
712 } | 713 } |
713 return origin_trial_policy_.get(); | 714 return origin_trial_policy_.get(); |
714 } | 715 } |
715 | 716 |
716 #if defined(OS_ANDROID) | 717 #if defined(OS_ANDROID) |
717 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 718 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
718 return new ChromeMediaClientAndroid(); | 719 return new ChromeMediaClientAndroid(); |
719 } | 720 } |
720 #endif // OS_ANDROID | 721 #endif // OS_ANDROID |
OLD | NEW |