Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc

Issue 628263004: [Android] Simplify logic for grabbing initial country-code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_chrome_shell_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 "components/search_engines/template_url_prepopulate_data.h"
10
11 static const char kDefaultCountryCode[] = "US";
12 9
13 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() { 10 ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {
14 return new ChromeMainDelegateChromeShellAndroid(); 11 return new ChromeMainDelegateChromeShellAndroid();
15 } 12 }
16 13
17 ChromeMainDelegateChromeShellAndroid::ChromeMainDelegateChromeShellAndroid() { 14 ChromeMainDelegateChromeShellAndroid::ChromeMainDelegateChromeShellAndroid() {
18 } 15 }
19 16
20 ChromeMainDelegateChromeShellAndroid::~ChromeMainDelegateChromeShellAndroid() { 17 ChromeMainDelegateChromeShellAndroid::~ChromeMainDelegateChromeShellAndroid() {
21 } 18 }
22 19
23 bool ChromeMainDelegateChromeShellAndroid::BasicStartupComplete( 20 bool ChromeMainDelegateChromeShellAndroid::BasicStartupComplete(
24 int* exit_code) { 21 int* exit_code) {
25 TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode);
26 return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code); 22 return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);
27 } 23 }
28 24
OLDNEW
« no previous file with comments | « base/base.gypi ('k') | chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698