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

Side by Side Diff: chrome/browser/ui/search/instant_controller.h

Issue 13963014: Local omnibox treats navsuggest suggestions as queries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert renaming change (now in a separate cl). Created 7 years, 7 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_SEARCH_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 content::PageTransition last_transition_type() const { 192 content::PageTransition last_transition_type() const {
193 return last_transition_type_; 193 return last_transition_type_;
194 } 194 }
195 195
196 // Non-const for Add/RemoveObserver only. Other model changes should only 196 // Non-const for Add/RemoveObserver only. Other model changes should only
197 // happen through the InstantController interface. 197 // happen through the InstantController interface.
198 InstantOverlayModel* model() { return &model_; } 198 InstantOverlayModel* model() { return &model_; }
199 199
200 private: 200 private:
201 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); 201 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
202 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
203 SearchQueryNotDisplayedForNavsuggest);
202 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); 204 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
203 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); 205 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
204 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); 206 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
205 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); 207 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
206 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); 208 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
207 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback); 209 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback);
208 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); 210 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant);
209 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 211 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
210 OmniboxTextUponFocusedCommittedSERP); 212 OmniboxTextUponFocusedCommittedSERP);
211 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 213 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 // Used for Top Sites async retrieval. 466 // Used for Top Sites async retrieval.
465 base::WeakPtrFactory<InstantController> weak_ptr_factory_; 467 base::WeakPtrFactory<InstantController> weak_ptr_factory_;
466 468
467 // Used to get notifications about Most Visted changes. 469 // Used to get notifications about Most Visted changes.
468 content::NotificationRegistrar registrar_; 470 content::NotificationRegistrar registrar_;
469 471
470 DISALLOW_COPY_AND_ASSIGN(InstantController); 472 DISALLOW_COPY_AND_ASSIGN(InstantController);
471 }; 473 };
472 474
473 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 475 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698