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

Unified Diff: chrome/browser/ui/search/search_tab_helper.h

Issue 701973002: Separate checking the user identity and checking if the user is syncing his history in two differen… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Answered mathp Created 6 years, 1 month 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
Index: chrome/browser/ui/search/search_tab_helper.h
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 5b5f460fcde3caf76ec53f846adcb99da82f2b34..d6740e7104b874f2ee6886bfaebd627f3b9d2104 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -118,7 +118,11 @@ class SearchTabHelper : public content::WebContentsObserver,
FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
OnChromeIdentityCheckSignedOutMismatch);
FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
- OnChromeIdentityCheckMatchNotSyncing);
+ OnHistorySyncCheckSyncInactive);
+ FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
+ OnHistorySyncCheckSyncing);
+ FRIEND_TEST_ALL_PREFIXES(SearchTabHelperTest,
+ OnHistorySyncCheckNotSyncing);
FRIEND_TEST_ALL_PREFIXES(SearchTabHelperWindowTest,
OnProvisionalLoadFailRedirectNTPToLocal);
FRIEND_TEST_ALL_PREFIXES(SearchTabHelperWindowTest,
@@ -174,6 +178,7 @@ class SearchTabHelper : public content::WebContentsObserver,
const base::string16& provider) override;
void PasteIntoOmnibox(const base::string16& text) override;
void OnChromeIdentityCheck(const base::string16& identity) override;
+ void OnHistorySyncCheck() override;
// Overridden from InstantServiceObserver:
void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) override;

Powered by Google App Engine
This is Rietveld 408576698