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

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

Issue 23804002: Make OmniboxEditModel::UpdatePermanentText() fetch the new text itself rather (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 string16* text, 131 string16* text,
132 GURL* url, 132 GURL* url,
133 bool* write_url); 133 bool* write_url);
134 134
135 bool user_input_in_progress() const { return user_input_in_progress_; } 135 bool user_input_in_progress() const { return user_input_in_progress_; }
136 136
137 // Sets the state of user_input_in_progress_, and notifies the observer if 137 // Sets the state of user_input_in_progress_, and notifies the observer if
138 // that state has changed. 138 // that state has changed.
139 void SetInputInProgress(bool in_progress); 139 void SetInputInProgress(bool in_progress);
140 140
141 // Updates permanent_text_ to |new_permanent_text|. Returns true if this 141 // Updates permanent_text_ to the current permanent text from the toolbar
142 // change should be immediately user-visible, because either the user is not 142 // model. Returns true if this change should be immediately user-visible,
143 // editing or the edit does not have focus. 143 // because either the user is not editing or the edit does not have focus.
144 bool UpdatePermanentText(const string16& new_permanent_text); 144 bool UpdatePermanentText();
145 145
146 // Returns the URL corresponding to the permanent text. 146 // Returns the URL corresponding to the permanent text.
147 GURL PermanentURL(); 147 GURL PermanentURL();
148 148
149 // Sets the user_text_ to |text|. Only the View should call this. 149 // Sets the user_text_ to |text|. Only the View should call this.
150 void SetUserText(const string16& text); 150 void SetUserText(const string16& text);
151 151
152 // Commits the gray suggested text as if it's been input by the user. 152 // Commits the gray suggested text as if it's been input by the user.
153 // Returns true if the text was committed. 153 // Returns true if the text was committed.
154 // TODO: can the return type be void? 154 // TODO: can the return type be void?
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 // an exact keyword match. If this is true then keyword mode will be 528 // an exact keyword match. If this is true then keyword mode will be
529 // triggered automatically if the input is "<keyword> <search string>". We 529 // triggered automatically if the input is "<keyword> <search string>". We
530 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true. 530 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
531 // This has no effect if we're already in keyword mode. 531 // This has no effect if we're already in keyword mode.
532 bool allow_exact_keyword_match_; 532 bool allow_exact_keyword_match_;
533 533
534 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); 534 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
535 }; 535 };
536 536
537 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_ 537 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.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