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

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

Issue 12250033: Consolidate search terms extraction and Instant process determination. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style nit Created 7 years, 10 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_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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 // Returns "<organization_name> [<country>]". 47 // Returns "<organization_name> [<country>]".
48 static string16 GetEVCertName(const net::X509Certificate& cert); 48 static string16 GetEVCertName(const net::X509Certificate& cert);
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
57 // |display_search_urls_as_search_terms| is true and by
58 // WouldReplaceSearchURLWithSearchTerms.
59 string16 TryToExtractSearchTermsFromURL() const;
60
61 // Helper method to extract the profile from the navigation controller. 56 // Helper method to extract the profile from the navigation controller.
62 Profile* GetProfile() const; 57 Profile* GetProfile() const;
63 58
64 ToolbarModelDelegate* delegate_; 59 ToolbarModelDelegate* delegate_;
65 60
66 // Whether the text in the location bar is currently being edited. 61 // Whether the text in the location bar is currently being edited.
67 bool input_in_progress_; 62 bool input_in_progress_;
68 63
69 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl); 64 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModelImpl);
70 }; 65 };
71 66
72 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_ 67 #endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/search_unittest.cc ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698