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

Side by Side Diff: chrome/browser/autocomplete/search_provider.h

Issue 10860068: Fix Omnibox search provider's confusing internal variable semantics (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 // This file contains the Search autocomplete provider. This provider is 5 // This file contains the Search autocomplete provider. This provider is
6 // responsible for all non-keyword autocomplete entries that start with 6 // responsible for all non-keyword autocomplete entries that start with
7 // "Search <engine> for ...", including searching for the current input string, 7 // "Search <engine> for ...", including searching for the current input string,
8 // search history, and search suggestions. An instance of it gets created and 8 // search history, and search suggestions. An instance of it gets created and
9 // managed by the autocomplete controller. 9 // managed by the autocomplete controller.
10 10
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 // The user's input. 328 // The user's input.
329 AutocompleteInput input_; 329 AutocompleteInput input_;
330 330
331 // Input text when searching against the keyword provider. 331 // Input text when searching against the keyword provider.
332 string16 keyword_input_text_; 332 string16 keyword_input_text_;
333 333
334 // Searches in the user's history that begin with the input text. 334 // Searches in the user's history that begin with the input text.
335 HistoryResults keyword_history_results_; 335 HistoryResults keyword_history_results_;
336 HistoryResults default_history_results_; 336 HistoryResults default_history_results_;
337 337
338 // Indicates that |timer_| is still running. When it triggers, we'll
339 // send requests to the suggest server.
340 bool in_timer_phase_;
msw 2012/08/21 17:12:28 Why not remove this and just use timer_.IsRunning(
Mark P 2012/08/21 17:47:51 No reason why not. I didn't know there was that i
341
338 // Number of suggest results that haven't yet arrived. If greater than 0 it 342 // Number of suggest results that haven't yet arrived. If greater than 0 it
339 // indicates either |timer_| or one of the URLFetchers is still running. 343 // indicates one of the URLFetchers is still running.
340 int suggest_results_pending_; 344 int suggest_results_pending_;
341 345
342 // A timer to start a query to the suggest server after the user has stopped 346 // A timer to start a query to the suggest server after the user has stopped
343 // typing for long enough. 347 // typing for long enough.
344 base::OneShotTimer<SearchProvider> timer_; 348 base::OneShotTimer<SearchProvider> timer_;
345 349
346 // The suggest field trial group number that we are in. This will be 350 // The suggest field trial group number that we are in. This will be
347 // removed later after the suggest delay experiments are removed. 351 // removed later after the suggest delay experiments are removed.
348 int suggest_field_trial_group_number_; 352 int suggest_field_trial_group_number_;
349 353
(...skipping 25 matching lines...) Expand all
375 // Has FinalizeInstantQuery been invoked since the last |Start|? 379 // Has FinalizeInstantQuery been invoked since the last |Start|?
376 bool instant_finalized_; 380 bool instant_finalized_;
377 381
378 // The |suggest_text| parameter passed to FinalizeInstantQuery. 382 // The |suggest_text| parameter passed to FinalizeInstantQuery.
379 string16 default_provider_suggest_text_; 383 string16 default_provider_suggest_text_;
380 384
381 DISALLOW_COPY_AND_ASSIGN(SearchProvider); 385 DISALLOW_COPY_AND_ASSIGN(SearchProvider);
382 }; 386 };
383 387
384 #endif // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_ 388 #endif // CHROME_BROWSER_AUTOCOMPLETE_SEARCH_PROVIDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698