OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android/shell/chrome_main_delegate_testshell_android.h" | 5 #include "chrome/android/shell/chrome_main_delegate_chrome_shell_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
9 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 9 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
10 | 10 |
11 static const char kDefaultCountryCode[] = "US"; | 11 static const char kDefaultCountryCode[] = "US"; |
12 | 12 |
13 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() { | 13 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() { |
14 return new ChromeMainDelegateTestShellAndroid(); | 14 return new ChromeMainDelegateChromeShellAndroid(); |
15 } | 15 } |
16 | 16 |
17 ChromeMainDelegateTestShellAndroid::ChromeMainDelegateTestShellAndroid() { | 17 ChromeMainDelegateChromeShellAndroid::ChromeMainDelegateChromeShellAndroid() { |
18 } | 18 } |
19 | 19 |
20 ChromeMainDelegateTestShellAndroid::~ChromeMainDelegateTestShellAndroid() { | 20 ChromeMainDelegateChromeShellAndroid::~ChromeMainDelegateChromeShellAndroid() { |
21 } | 21 } |
22 | 22 |
23 bool ChromeMainDelegateTestShellAndroid::BasicStartupComplete(int* exit_code) { | 23 bool ChromeMainDelegateChromeShellAndroid::BasicStartupComplete( |
| 24 int* exit_code) { |
24 TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode); | 25 TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode); |
25 return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code); | 26 return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code); |
26 } | 27 } |
27 | 28 |
OLD | NEW |