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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_model_impl.h

Issue 11415292: [Search] No longer reverting omnibox text on instant search (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: indent Created 8 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
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_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 49
50 private: 50 private:
51 // Returns the navigation controller used to retrieve the navigation entry 51 // Returns the navigation controller used to retrieve the navigation entry
52 // from which the states are retrieved. 52 // from which the states are retrieved.
53 // If this returns NULL, default values are used. 53 // If this returns NULL, default values are used.
54 content::NavigationController* GetNavigationController() const; 54 content::NavigationController* GetNavigationController() const;
55 55
56 // Attempt to extract search terms from the current url. Called by GetText if 56 // Attempt to extract search terms from the current url. Called by GetText if
57 // |display_search_urls_as_search_terms| is true and by 57 // |display_search_urls_as_search_terms| is true and by
58 // WouldReplaceSearchURLWithSearchTerms. 58 // WouldReplaceSearchURLWithSearchTerms.
59 string16 TryToExtractSearchTermsFromURL() const; 59 string16 TryToExtractSearchTermsFromCurrentURL() const;
60 60
61 // Helper method to extract the profile from the navigation controller. 61 // Helper method to extract the profile from the navigation controller.
62 Profile* GetProfile() const; 62 Profile* GetProfile() const;
63 63
64 ToolbarModelDelegate* delegate_; 64 ToolbarModelDelegate* delegate_;
65 65
66 // Whether the text in the location bar is currently being edited. 66 // Whether the text in the location bar is currently being edited.
67 bool input_in_progress_; 67 bool input_in_progress_;
68 68
69 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl); 69 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
70 }; 70 };
71 71
72 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 72 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698