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

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

Issue 19197005: Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion| (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: drop user_text() in omnibox_edit_model Created 7 years, 5 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
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_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_ 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_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 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 bool text_differs, 292 bool text_differs,
293 bool just_deleted_text, 293 bool just_deleted_text,
294 bool allow_keyword_ui_change); 294 bool allow_keyword_ui_change);
295 295
296 // Called when the current match has changed in the OmniboxController. 296 // Called when the current match has changed in the OmniboxController.
297 void OnCurrentMatchChanged(); 297 void OnCurrentMatchChanged();
298 298
299 // Access the current view text. 299 // Access the current view text.
300 string16 GetViewText() const; 300 string16 GetViewText() const;
301 301
302 string16 user_text() const { return user_text_; }
303
304 // TODO(beaudoin): We need this to allow OmniboxController access the 302 // TODO(beaudoin): We need this to allow OmniboxController access the
305 // InstantController via OmniboxEditController, because the only valid pointer 303 // InstantController via OmniboxEditController, because the only valid pointer
306 // to InstantController is kept in Browser. We should try to get rid of this, 304 // to InstantController is kept in Browser. We should try to get rid of this,
307 // maybe by ensuring InstantController lives as long as Browser. 305 // maybe by ensuring InstantController lives as long as Browser.
308 InstantController* GetInstantController() const; 306 InstantController* GetInstantController() const;
309 307
310 private: 308 private:
311 friend class OmniboxControllerTest; 309 friend class OmniboxControllerTest;
312 310
313 enum PasteState { 311 enum PasteState {
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 // an exact keyword match. If this is true then keyword mode will be 509 // an exact keyword match. If this is true then keyword mode will be
512 // triggered automatically if the input is "<keyword> <search string>". We 510 // triggered automatically if the input is "<keyword> <search string>". We
513 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true. 511 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
514 // This has no effect if we're already in keyword mode. 512 // This has no effect if we're already in keyword mode.
515 bool allow_exact_keyword_match_; 513 bool allow_exact_keyword_match_;
516 514
517 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); 515 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
518 }; 516 };
519 517
520 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_ 518 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/omnibox/omnibox_controller.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698