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

Side by Side Diff: chrome/browser/instant/instant_controller.h

Issue 12319108: Prevent querying of restricted query values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove query_state_ from SearchBox. Created 7 years, 9 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_INSTANT_INSTANT_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 // happen through the InstantController interface. 187 // happen through the InstantController interface.
188 InstantModel* model() { return &model_; } 188 InstantModel* model() { return &model_; }
189 189
190 private: 190 private:
191 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); 191 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
192 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); 192 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL);
193 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); 193 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
194 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); 194 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh);
195 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); 195 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn);
196 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); 196 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited);
197 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, RestrictedItemReadback);
197 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); 198 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant);
198 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 199 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
199 OmniboxTextUponFocusedCommittedSERP); 200 OmniboxTextUponFocusedCommittedSERP);
200 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, 201 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest,
201 MiddleClickOnSuggestionOpensInNewTab); 202 MiddleClickOnSuggestionOpensInNewTab);
202 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); 203 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded);
203 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); 204 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab);
204 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); 205 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab);
205 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); 206 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation);
206 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); 207 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance);
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // Used for Top Sites async retrieval. 441 // Used for Top Sites async retrieval.
441 base::WeakPtrFactory<InstantController> weak_ptr_factory_; 442 base::WeakPtrFactory<InstantController> weak_ptr_factory_;
442 443
443 // Used to get notifications about Most Visted changes. 444 // Used to get notifications about Most Visted changes.
444 content::NotificationRegistrar registrar_; 445 content::NotificationRegistrar registrar_;
445 446
446 DISALLOW_COPY_AND_ASSIGN(InstantController); 447 DISALLOW_COPY_AND_ASSIGN(InstantController);
447 }; 448 };
448 449
449 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 450 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/instant/instant_extended_browsertest.cc » ('j') | chrome/test/data/instant_extended.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698