chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc - Issue 628263004: [Android] Simplify logic for grabbing initial country-code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/sync_shell/chrome_main_delegate_chrome_sync_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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/shell/chrome_main_delegate_chrome_shell_android.cc ('k') | chrome/browser/search_engines/search_provider_install_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc

diff --git a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc

index eba89e60fa0a2e271c8c455aed8d2fc09a36f7a3..5016dc886573885b9b3e71ed3558704ea7452800 100644

--- a/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc

+++ b/chrome/android/sync_shell/chrome_main_delegate_chrome_sync_shell_android.cc

@@ -6,11 +6,8 @@

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

-#include "components/search_engines/template_url_prepopulate_data.h"

#include "sync/test/fake_server/android/fake_server_helper_android.h"

-static const char kDefaultCountryCode[] = "US";

ChromeMainDelegateAndroid* ChromeMainDelegateAndroid::Create() {

return new ChromeMainDelegateChromeSyncShellAndroid();

}

@@ -32,7 +29,6 @@ ChromeMainDelegateChromeSyncShellAndroid::RegisterApplicationNativeMethods(

bool ChromeMainDelegateChromeSyncShellAndroid::BasicStartupComplete(

int* exit_code) {

- TemplateURLPrepopulateData::InitCountryCode(kDefaultCountryCode);

return ChromeMainDelegateAndroid::BasicStartupComplete(exit_code);

}