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

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

Issue 16035020: Move instant support to SearchTabHelper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed nits Created 7 years, 6 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 <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 237
238 // Returns the transition type of the last AutocompleteMatch passed to Update. 238 // Returns the transition type of the last AutocompleteMatch passed to Update.
239 content::PageTransition last_transition_type() const { 239 content::PageTransition last_transition_type() const {
240 return last_transition_type_; 240 return last_transition_type_;
241 } 241 }
242 242
243 // Non-const for Add/RemoveObserver only. Other model changes should only 243 // Non-const for Add/RemoveObserver only. Other model changes should only
244 // happen through the InstantController interface. 244 // happen through the InstantController interface.
245 InstantOverlayModel* model() { return &model_; } 245 InstantOverlayModel* model() { return &model_; }
246 246
247 // Used by BrowserInstantController to notify InstantController about the
248 // instant support change event for the active web contents.
249 void InstantSupportChanged(InstantSupportState instant_support);
250
247 protected: 251 protected:
248 // Accessors are made protected for testing purposes. 252 // Accessors are made protected for testing purposes.
249 virtual bool extended_enabled() const; 253 virtual bool extended_enabled() const;
250 254
251 virtual InstantOverlay* overlay() const; 255 virtual InstantOverlay* overlay() const;
252 virtual InstantTab* instant_tab() const; 256 virtual InstantTab* instant_tab() const;
253 virtual InstantNTP* ntp() const; 257 virtual InstantNTP* ntp() const;
254 258
255 virtual Profile* profile() const; 259 virtual Profile* profile() const;
256 260
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 565 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
562 bool allow_overlay_to_show_search_suggestions_; 566 bool allow_overlay_to_show_search_suggestions_;
563 567
564 // List of events and their timestamps, useful in debugging Instant behaviour. 568 // List of events and their timestamps, useful in debugging Instant behaviour.
565 mutable std::list<std::pair<int64, std::string> > debug_events_; 569 mutable std::list<std::pair<int64, std::string> > debug_events_;
566 570
567 DISALLOW_COPY_AND_ASSIGN(InstantController); 571 DISALLOW_COPY_AND_ASSIGN(InstantController);
568 }; 572 };
569 573
570 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 574 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_instant_controller.cc ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698