Separate checking the user identity and checking if the user is syncing his history in two differen…

chrome/renderer/searchbox/searchbox.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/searchbox/searchbox.h"
 
 #include <string>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 159 matching lines @@
                                          const base::string16& provider) {
   render_view()->Send(new ChromeViewHostMsg_LogMostVisitedNavigation(
       render_view()->GetRoutingID(), page_seq_no_, position, provider));
 }
 
 void SearchBox::CheckIsUserSignedInToChromeAs(const base::string16& identity) {
   render_view()->Send(new ChromeViewHostMsg_ChromeIdentityCheck(
       render_view()->GetRoutingID(), page_seq_no_, identity));
 }
 
+void SearchBox::CheckIsUserSyncingHistory() {
+  render_view()->Send(new ChromeViewHostMsg_HistorySyncCheck(
+      render_view()->GetRoutingID(), page_seq_no_));
+}
+
 void SearchBox::DeleteMostVisitedItem(
     InstantRestrictedID most_visited_item_id) {
   render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
       render_view()->GetRoutingID(),
       page_seq_no_,
       GetURLForMostVisitedItem(most_visited_item_id)));
 }
 
 bool SearchBox::GenerateFaviconURLFromTransientURL(const GURL& transient_url,
                                                    GURL* url) const {
@@ skipping 99 matching lines @@
 
 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SetPageSequenceNumber,
                         OnSetPageSequenceNumber)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_ChromeIdentityCheckResult,
                         OnChromeIdentityCheckResult)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_HistorySyncCheckResult,
+                        OnHistorySyncCheckResult)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFocusChanged, OnFocusChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
                         OnMostVisitedChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPromoInformation,
                         OnPromoInformationReceived)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetDisplayInstantResults,
                         OnSetDisplayInstantResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetInputInProgress,
                         OnSetInputInProgress)
@@ skipping 57 matching lines @@
     is_focused_ = is_focused;
     DVLOG(1) << render_view() << " OnFocusChange";
     if (render_view()->GetWebView() &&
         render_view()->GetWebView()->mainFrame()) {
       extensions_v8::SearchBoxExtension::DispatchFocusChange(
           render_view()->GetWebView()->mainFrame());
     }
   }
 }
 
+void SearchBox::OnHistorySyncCheckResult(bool sync_history) {
+  if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
+    extensions_v8::SearchBoxExtension::DispatchHistorySyncCheckResult(
+        render_view()->GetWebView()->mainFrame(), sync_history);
+  }
+}
+
 void SearchBox::OnMarginChange(int margin) {
   start_margin_ = margin;
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     extensions_v8::SearchBoxExtension::DispatchMarginChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
 void SearchBox::OnMostVisitedChanged(
     const std::vector<InstantMostVisitedItem>& items) {
@@ skipping 83 matching lines @@
 
 void SearchBox::Reset() {
   query_.clear();
   embedded_search_request_params_ = EmbeddedSearchRequestParams();
   suggestion_ = InstantSuggestion();
   start_margin_ = 0;
   is_focused_ = false;
   is_key_capture_enabled_ = false;
   theme_info_ = ThemeBackgroundInfo();
 }