Index: chrome/browser/ui/search/search_tab_helper.cc |
diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc |
index 1ed4f538a04f595aaf1e97253cca4e0e12fcd1e7..029de9b0d0702d01f41988e951011abada5cf086 100644 |
--- a/chrome/browser/ui/search/search_tab_helper.cc |
+++ b/chrome/browser/ui/search/search_tab_helper.cc |
@@ -565,14 +565,16 @@ void SearchTabHelper::OnChromeIdentityCheck(const base::string16& identity) { |
if (manager) { |
const base::string16 username = |
base::UTF8ToUTF16(manager->GetAuthenticatedUsername()); |
- // The identity check only passes if the user is syncing their history. |
- // TODO(beaudoin): Change this function name and related APIs now that it's |
- // checking both the identity and the user's sync state. |
- bool matches = IsHistorySyncEnabled(profile()) && identity == username; |
- ipc_router_.SendChromeIdentityCheckResult(identity, matches); |
+ ipc_router_.SendChromeIdentityCheckResult(identity, identity == username); |
+ } else { |
+ ipc_router_.SendChromeIdentityCheckResult(identity, false); |
} |
} |
+void SearchTabHelper::OnHistorySyncCheck() { |
+ ipc_router_.SendHistorySyncCheckResult(IsHistorySyncEnabled(profile())); |
+} |
+ |
void SearchTabHelper::UpdateMode(bool update_origin, bool is_preloaded_ntp) { |
SearchMode::Type type = SearchMode::MODE_DEFAULT; |
SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT; |