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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_controller.h

Issue 21042013: Have SearchProvider look up the omnibox start margin directly. (Closed) Base URL: https://git.chromium.org/chromium/src.git@master
Patch Set: Rebase and respond to comments. Created 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 30 matching lines...) Expand all
41 virtual ~OmniboxController(); 41 virtual ~OmniboxController();
42 42
43 // |current_url| is only set for mobile ports. 43 // |current_url| is only set for mobile ports.
44 void StartAutocomplete( 44 void StartAutocomplete(
45 string16 user_text, 45 string16 user_text,
46 size_t cursor_position, 46 size_t cursor_position,
47 const GURL& current_url, 47 const GURL& current_url,
48 AutocompleteInput::PageClassification current_page_classification, 48 AutocompleteInput::PageClassification current_page_classification,
49 bool prevent_inline_autocomplete, 49 bool prevent_inline_autocomplete,
50 bool prefer_keyword, 50 bool prefer_keyword,
51 bool allow_exact_keyword_match, 51 bool allow_exact_keyword_match) const;
52 int omnibox_start_margin) const;
53 52
54 // AutocompleteControllerDelegate: 53 // AutocompleteControllerDelegate:
55 virtual void OnResultChanged(bool default_match_changed) OVERRIDE; 54 virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
56 55
57 AutocompleteController* autocomplete_controller() { 56 AutocompleteController* autocomplete_controller() {
58 return autocomplete_controller_.get(); 57 return autocomplete_controller_.get();
59 } 58 }
60 59
61 // Set |current_match_| to an invalid value, indicating that we do not yet 60 // Set |current_match_| to an invalid value, indicating that we do not yet
62 // have a valid match for the current text in the omnibox. 61 // have a valid match for the current text in the omnibox.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // TODO(beaudoin): This AutocompleteMatch is used to let the OmniboxEditModel 95 // TODO(beaudoin): This AutocompleteMatch is used to let the OmniboxEditModel
97 // know what it should display. Not every field is required for that purpose, 96 // know what it should display. Not every field is required for that purpose,
98 // but the ones specifically needed are unclear. We should therefore spend 97 // but the ones specifically needed are unclear. We should therefore spend
99 // some time to extract these fields and use a tighter structure here. 98 // some time to extract these fields and use a tighter structure here.
100 AutocompleteMatch current_match_; 99 AutocompleteMatch current_match_;
101 100
102 DISALLOW_COPY_AND_ASSIGN(OmniboxController); 101 DISALLOW_COPY_AND_ASSIGN(OmniboxController);
103 }; 102 };
104 103
105 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ 104 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698