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/google/google_util.h" | 5 #include "chrome/browser/google/google_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
13 #include "base/strings/string_split.h" | 13 #include "base/strings/string_split.h" |
14 #include "base/strings/string_util.h" | 14 #include "base/strings/string_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/google/google_url_tracker.h" | 17 #include "chrome/browser/google/google_url_tracker.h" |
18 #include "chrome/common/chrome_switches.h" | |
19 #include "chrome/common/net/url_fixer_upper.h" | 18 #include "chrome/common/net/url_fixer_upper.h" |
20 #include "chrome/installer/util/google_update_settings.h" | 19 #include "chrome/installer/util/google_update_settings.h" |
| 20 #include "components/google/core/browser/google_switches.h" |
21 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 21 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
22 #include "net/base/url_util.h" | 22 #include "net/base/url_util.h" |
23 #include "url/gurl.h" | 23 #include "url/gurl.h" |
24 | 24 |
25 #if defined(OS_MACOSX) | 25 #if defined(OS_MACOSX) |
26 #include "chrome/browser/mac/keystone_glue.h" | 26 #include "chrome/browser/mac/keystone_glue.h" |
27 #elif defined(OS_CHROMEOS) | 27 #elif defined(OS_CHROMEOS) |
28 #include "chrome/browser/google/google_util_chromeos.h" | 28 #include "chrome/browser/google/google_util_chromeos.h" |
29 #endif | 29 #endif |
30 | 30 |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 DCHECK(brand_for_testing == NULL); | 314 DCHECK(brand_for_testing == NULL); |
315 brand_for_testing = brand_.c_str(); | 315 brand_for_testing = brand_.c_str(); |
316 } | 316 } |
317 | 317 |
318 BrandForTesting::~BrandForTesting() { | 318 BrandForTesting::~BrandForTesting() { |
319 brand_for_testing = NULL; | 319 brand_for_testing = NULL; |
320 } | 320 } |
321 | 321 |
322 | 322 |
323 } // namespace google_util | 323 } // namespace google_util |
OLD | NEW |