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

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: '' 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 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 // Returns the transition type of the last AutocompleteMatch passed to Update. 237 // Returns the transition type of the last AutocompleteMatch passed to Update.
238 content::PageTransition last_transition_type() const { 238 content::PageTransition last_transition_type() const {
239 return last_transition_type_; 239 return last_transition_type_;
240 } 240 }
241 241
242 // Non-const for Add/RemoveObserver only. Other model changes should only 242 // Non-const for Add/RemoveObserver only. Other model changes should only
243 // happen through the InstantController interface. 243 // happen through the InstantController interface.
244 InstantOverlayModel* model() { return &model_; } 244 InstantOverlayModel* model() { return &model_; }
245 245
246 // Used by BrowserInstantController to notify InstantController about the
247 // instant support change event for the given |web_contents|.
248 void InstantSupportChanged(const content::WebContents* web_contents,
249 InstantSupportState instant_support);
250
246 protected: 251 protected:
247 // Accessors are made protected for testing purposes. 252 // Accessors are made protected for testing purposes.
248 virtual bool extended_enabled() const; 253 virtual bool extended_enabled() const;
249 254
250 virtual InstantOverlay* overlay() const; 255 virtual InstantOverlay* overlay() const;
251 virtual InstantTab* instant_tab() const; 256 virtual InstantTab* instant_tab() const;
252 virtual InstantNTP* ntp() const; 257 virtual InstantNTP* ntp() const;
253 258
254 private: 259 private:
255 friend class InstantExtendedManualTest; 260 friend class InstantExtendedManualTest;
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 548 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
544 bool allow_overlay_to_show_search_suggestions_; 549 bool allow_overlay_to_show_search_suggestions_;
545 550
546 // List of events and their timestamps, useful in debugging Instant behaviour. 551 // List of events and their timestamps, useful in debugging Instant behaviour.
547 mutable std::list<std::pair<int64, std::string> > debug_events_; 552 mutable std::list<std::pair<int64, std::string> > debug_events_;
548 553
549 DISALLOW_COPY_AND_ASSIGN(InstantController); 554 DISALLOW_COPY_AND_ASSIGN(InstantController);
550 }; 555 };
551 556
552 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ 557 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698