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

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

Issue 8612007: Add OVERRIDE to chrome/browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_ 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_ 6 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 // do the "ctrl-enter" behavior when the user hits 356 // do the "ctrl-enter" behavior when the user hits
357 // enter. 357 // enter.
358 DOWN_WITH_CHANGE, // The control key is depressed, and the edit's 358 DOWN_WITH_CHANGE, // The control key is depressed, and the edit's
359 // contents/selection have changed since it was 359 // contents/selection have changed since it was
360 // depressed. If the user now hits enter, we assume 360 // depressed. If the user now hits enter, we assume
361 // he simply hasn't released the key, rather than that 361 // he simply hasn't released the key, rather than that
362 // he intended to hit "ctrl-enter". 362 // he intended to hit "ctrl-enter".
363 }; 363 };
364 364
365 // AutocompleteControllerDelegate: 365 // AutocompleteControllerDelegate:
366 virtual void OnResultChanged(bool default_match_changed); 366 virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
367 367
368 // Returns true if a query to an autocomplete provider is currently 368 // Returns true if a query to an autocomplete provider is currently
369 // in progress. This logic should in the future live in 369 // in progress. This logic should in the future live in
370 // AutocompleteController but resides here for now. This method is used by 370 // AutocompleteController but resides here for now. This method is used by
371 // AutomationProvider::AutocompleteEditIsQueryInProgress. 371 // AutomationProvider::AutocompleteEditIsQueryInProgress.
372 bool query_in_progress() const; 372 bool query_in_progress() const;
373 373
374 // Called whenever user_text_ should change. 374 // Called whenever user_text_ should change.
375 void InternalSetUserText(const string16& text); 375 void InternalSetUserText(const string16& text);
376 376
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 // It has no effect if a keyword is already selected. 550 // It has no effect if a keyword is already selected.
551 bool allow_exact_keyword_match_; 551 bool allow_exact_keyword_match_;
552 552
553 // Last value of InstantCompleteBehavior supplied to |SetSuggestedText|. 553 // Last value of InstantCompleteBehavior supplied to |SetSuggestedText|.
554 InstantCompleteBehavior instant_complete_behavior_; 554 InstantCompleteBehavior instant_complete_behavior_;
555 555
556 DISALLOW_COPY_AND_ASSIGN(AutocompleteEditModel); 556 DISALLOW_COPY_AND_ASSIGN(AutocompleteEditModel);
557 }; 557 };
558 558
559 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_ 559 #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698