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

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

Issue 89273002: Eliminate the OmniboxEditModel::GetViewText() method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nuke GetViewText instead. Created 7 years 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
« no previous file with comments | « no previous file | chrome/browser/ui/omnibox/omnibox_edit_model.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 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 size_t selection_start, 312 size_t selection_start,
313 size_t selection_end, 313 size_t selection_end,
314 bool selection_differs, 314 bool selection_differs,
315 bool text_differs, 315 bool text_differs,
316 bool just_deleted_text, 316 bool just_deleted_text,
317 bool allow_keyword_ui_change); 317 bool allow_keyword_ui_change);
318 318
319 // Called when the current match has changed in the OmniboxController. 319 // Called when the current match has changed in the OmniboxController.
320 void OnCurrentMatchChanged(); 320 void OnCurrentMatchChanged();
321 321
322 // Access the current view text.
323 string16 GetViewText() const;
324
325 // TODO(beaudoin): We need this to allow OmniboxController access the 322 // TODO(beaudoin): We need this to allow OmniboxController access the
326 // InstantController via OmniboxEditController, because the only valid pointer 323 // InstantController via OmniboxEditController, because the only valid pointer
327 // to InstantController is kept in Browser. We should try to get rid of this, 324 // to InstantController is kept in Browser. We should try to get rid of this,
328 // maybe by ensuring InstantController lives as long as Browser. 325 // maybe by ensuring InstantController lives as long as Browser.
329 InstantController* GetInstantController() const; 326 InstantController* GetInstantController() const;
330 327
331 // Name of the histogram tracking cut or copy omnibox commands. 328 // Name of the histogram tracking cut or copy omnibox commands.
332 static const char kCutOrCopyAllTextHistogram[]; 329 static const char kCutOrCopyAllTextHistogram[];
333 330
334 private: 331 private:
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 // an exact keyword match. If this is true then keyword mode will be 541 // an exact keyword match. If this is true then keyword mode will be
545 // triggered automatically if the input is "<keyword> <search string>". We 542 // triggered automatically if the input is "<keyword> <search string>". We
546 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true. 543 // allow this when CreatedKeywordSearchByInsertingSpaceInMiddle() is true.
547 // This has no effect if we're already in keyword mode. 544 // This has no effect if we're already in keyword mode.
548 bool allow_exact_keyword_match_; 545 bool allow_exact_keyword_match_;
549 546
550 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); 547 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel);
551 }; 548 };
552 549
553 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_ 550 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_MODEL_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698