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

Side by Side Diff: chrome/renderer/searchbox/searchbox.cc

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: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/renderer/searchbox/searchbox.h" 5 #include "chrome/renderer/searchbox/searchbox.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 const base::string16& provider) { 170 const base::string16& provider) {
171 render_view()->Send(new ChromeViewHostMsg_LogMostVisitedNavigation( 171 render_view()->Send(new ChromeViewHostMsg_LogMostVisitedNavigation(
172 render_view()->GetRoutingID(), page_seq_no_, position, provider)); 172 render_view()->GetRoutingID(), page_seq_no_, position, provider));
173 } 173 }
174 174
175 void SearchBox::CheckIsUserSignedInToChromeAs(const base::string16& identity) { 175 void SearchBox::CheckIsUserSignedInToChromeAs(const base::string16& identity) {
176 render_view()->Send(new ChromeViewHostMsg_ChromeIdentityCheck( 176 render_view()->Send(new ChromeViewHostMsg_ChromeIdentityCheck(
177 render_view()->GetRoutingID(), page_seq_no_, identity)); 177 render_view()->GetRoutingID(), page_seq_no_, identity));
178 } 178 }
179 179
180 void SearchBox::CheckUserSyncHistory() {
181 render_view()->Send(new ChromeViewHostMsg_CheckUserSyncHistory(
182 render_view()->GetRoutingID(), page_seq_no_));
183 }
184
180 void SearchBox::DeleteMostVisitedItem( 185 void SearchBox::DeleteMostVisitedItem(
181 InstantRestrictedID most_visited_item_id) { 186 InstantRestrictedID most_visited_item_id) {
182 render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem( 187 render_view()->Send(new ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem(
183 render_view()->GetRoutingID(), 188 render_view()->GetRoutingID(),
184 page_seq_no_, 189 page_seq_no_,
185 GetURLForMostVisitedItem(most_visited_item_id))); 190 GetURLForMostVisitedItem(most_visited_item_id)));
186 } 191 }
187 192
188 bool SearchBox::GenerateFaviconURLFromTransientURL(const GURL& transient_url, 193 bool SearchBox::GenerateFaviconURLFromTransientURL(const GURL& transient_url,
189 GURL* url) const { 194 GURL* url) const {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion( 286 render_view()->Send(new ChromeViewHostMsg_SearchBoxUndoMostVisitedDeletion(
282 render_view()->GetRoutingID(), page_seq_no_, 287 render_view()->GetRoutingID(), page_seq_no_,
283 GetURLForMostVisitedItem(most_visited_item_id))); 288 GetURLForMostVisitedItem(most_visited_item_id)));
284 } 289 }
285 290
286 bool SearchBox::OnMessageReceived(const IPC::Message& message) { 291 bool SearchBox::OnMessageReceived(const IPC::Message& message) {
287 bool handled = true; 292 bool handled = true;
288 IPC_BEGIN_MESSAGE_MAP(SearchBox, message) 293 IPC_BEGIN_MESSAGE_MAP(SearchBox, message)
289 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetPageSequenceNumber, 294 IPC_MESSAGE_HANDLER(ChromeViewMsg_SetPageSequenceNumber,
290 OnSetPageSequenceNumber) 295 OnSetPageSequenceNumber)
296 IPC_MESSAGE_HANDLER(ChromeViewMsg_CheckUserSyncHistoryResult,
297 OnCheckUserSyncHistoryResult)
291 IPC_MESSAGE_HANDLER(ChromeViewMsg_ChromeIdentityCheckResult, 298 IPC_MESSAGE_HANDLER(ChromeViewMsg_ChromeIdentityCheckResult,
292 OnChromeIdentityCheckResult) 299 OnChromeIdentityCheckResult)
293 IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant, 300 IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
294 OnDetermineIfPageSupportsInstant) 301 OnDetermineIfPageSupportsInstant)
295 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFocusChanged, OnFocusChanged) 302 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxFocusChanged, OnFocusChanged)
296 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange) 303 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange)
297 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged, 304 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMostVisitedItemsChanged,
298 OnMostVisitedChanged) 305 OnMostVisitedChanged)
299 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPromoInformation, 306 IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPromoInformation,
300 OnPromoInformationReceived) 307 OnPromoInformationReceived)
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 } 456 }
450 } 457 }
451 458
452 void SearchBox::OnToggleVoiceSearch() { 459 void SearchBox::OnToggleVoiceSearch() {
453 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 460 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
454 extensions_v8::SearchBoxExtension::DispatchToggleVoiceSearch( 461 extensions_v8::SearchBoxExtension::DispatchToggleVoiceSearch(
455 render_view()->GetWebView()->mainFrame()); 462 render_view()->GetWebView()->mainFrame());
456 } 463 }
457 } 464 }
458 465
466 void SearchBox::OnCheckUserSyncHistoryResult(bool sync_history) {
467 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
468 extensions_v8::SearchBoxExtension::DispatchCheckUserSyncHistoryResult(
469 render_view()->GetWebView()->mainFrame(), sync_history);
470 }
471 }
472
459 GURL SearchBox::GetURLForMostVisitedItem(InstantRestrictedID item_id) const { 473 GURL SearchBox::GetURLForMostVisitedItem(InstantRestrictedID item_id) const {
460 InstantMostVisitedItem item; 474 InstantMostVisitedItem item;
461 return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL(); 475 return GetMostVisitedItemWithID(item_id, &item) ? item.url : GURL();
462 } 476 }
463 477
464 void SearchBox::Reset() { 478 void SearchBox::Reset() {
465 query_.clear(); 479 query_.clear();
466 suggestion_ = InstantSuggestion(); 480 suggestion_ = InstantSuggestion();
467 start_margin_ = 0; 481 start_margin_ = 0;
468 is_focused_ = false; 482 is_focused_ = false;
469 is_key_capture_enabled_ = false; 483 is_key_capture_enabled_ = false;
470 theme_info_ = ThemeBackgroundInfo(); 484 theme_info_ = ThemeBackgroundInfo();
471 } 485 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698