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

Side by Side Diff: chrome/renderer/searchbox/searchbox.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 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 #ifndef CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_ 5 #ifndef CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
6 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_ 6 #define CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 22 matching lines...) Expand all
33 33
34 // Sends ChromeViewHostMsg_LogMostVisitedImpression to the browser. 34 // Sends ChromeViewHostMsg_LogMostVisitedImpression to the browser.
35 void LogMostVisitedImpression(int position, const base::string16& provider); 35 void LogMostVisitedImpression(int position, const base::string16& provider);
36 36
37 // Sends ChromeViewHostMsg_LogMostVisitedNavigation to the browser. 37 // Sends ChromeViewHostMsg_LogMostVisitedNavigation to the browser.
38 void LogMostVisitedNavigation(int position, const base::string16& provider); 38 void LogMostVisitedNavigation(int position, const base::string16& provider);
39 39
40 // Sends ChromeViewHostMsg_ChromeIdentityCheck to the browser. 40 // Sends ChromeViewHostMsg_ChromeIdentityCheck to the browser.
41 void CheckIsUserSignedInToChromeAs(const base::string16& identity); 41 void CheckIsUserSignedInToChromeAs(const base::string16& identity);
42 42
43 // Sends ChromeViewHostMsg_HistorySyncCheck to the browser.
44 void CheckIsUserSyncingHistory();
45
43 // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser. 46 // Sends ChromeViewHostMsg_SearchBoxDeleteMostVisitedItem to the browser.
44 void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id); 47 void DeleteMostVisitedItem(InstantRestrictedID most_visited_item_id);
45 48
46 // Generates the favicon URL of the most visited item specified by the 49 // Generates the favicon URL of the most visited item specified by the
47 // |transient_url|. If the |transient_url| is valid, returns true and fills in 50 // |transient_url|. If the |transient_url| is valid, returns true and fills in
48 // |url|. If the |transient_url| is invalid, returns true and |url| is set to 51 // |url|. If the |transient_url| is invalid, returns true and |url| is set to
49 // "chrome-search://favicon/" in order to prevent the invalid URL to be 52 // "chrome-search://favicon/" in order to prevent the invalid URL to be
50 // requested. 53 // requested.
51 // 54 //
52 // Valid forms of |transient_url|: 55 // Valid forms of |transient_url|:
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 private: 118 private:
116 // Overridden from content::RenderViewObserver: 119 // Overridden from content::RenderViewObserver:
117 bool OnMessageReceived(const IPC::Message& message) override; 120 bool OnMessageReceived(const IPC::Message& message) override;
118 121
119 void OnSetPageSequenceNumber(int page_seq_no); 122 void OnSetPageSequenceNumber(int page_seq_no);
120 void OnChromeIdentityCheckResult(const base::string16& identity, 123 void OnChromeIdentityCheckResult(const base::string16& identity,
121 bool identity_match); 124 bool identity_match);
122 void OnDetermineIfPageSupportsInstant(); 125 void OnDetermineIfPageSupportsInstant();
123 void OnFocusChanged(OmniboxFocusState new_focus_state, 126 void OnFocusChanged(OmniboxFocusState new_focus_state,
124 OmniboxFocusChangeReason reason); 127 OmniboxFocusChangeReason reason);
128 void OnHistorySyncCheckResult(bool sync_history);
125 void OnMarginChange(int margin); 129 void OnMarginChange(int margin);
126 void OnMostVisitedChanged( 130 void OnMostVisitedChanged(
127 const std::vector<InstantMostVisitedItem>& items); 131 const std::vector<InstantMostVisitedItem>& items);
128 void OnPromoInformationReceived(bool is_app_launcher_enabled); 132 void OnPromoInformationReceived(bool is_app_launcher_enabled);
129 void OnSetDisplayInstantResults(bool display_instant_results); 133 void OnSetDisplayInstantResults(bool display_instant_results);
130 void OnSetInputInProgress(bool input_in_progress); 134 void OnSetInputInProgress(bool input_in_progress);
131 void OnSetSuggestionToPrefetch(const InstantSuggestion& suggestion); 135 void OnSetSuggestionToPrefetch(const InstantSuggestion& suggestion);
132 void OnSubmit(const base::string16& query); 136 void OnSubmit(const base::string16& query);
133 void OnThemeChanged(const ThemeBackgroundInfo& theme_info); 137 void OnThemeChanged(const ThemeBackgroundInfo& theme_info);
134 void OnToggleVoiceSearch(); 138 void OnToggleVoiceSearch();
(...skipping 16 matching lines...) Expand all
151 InstantRestrictedIDCache<InstantMostVisitedItem> most_visited_items_cache_; 155 InstantRestrictedIDCache<InstantMostVisitedItem> most_visited_items_cache_;
152 ThemeBackgroundInfo theme_info_; 156 ThemeBackgroundInfo theme_info_;
153 base::string16 query_; 157 base::string16 query_;
154 int start_margin_; 158 int start_margin_;
155 InstantSuggestion suggestion_; 159 InstantSuggestion suggestion_;
156 160
157 DISALLOW_COPY_AND_ASSIGN(SearchBox); 161 DISALLOW_COPY_AND_ASSIGN(SearchBox);
158 }; 162 };
159 163
160 #endif // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_ 164 #endif // CHROME_RENDERER_SEARCHBOX_SEARCHBOX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698