| OLD | NEW |
| 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 10 matching lines...) Expand all Loading... |
| 21 #include "chrome/browser/instant/instant_commit_type.h" | 21 #include "chrome/browser/instant/instant_commit_type.h" |
| 22 #include "chrome/browser/instant/instant_model.h" | 22 #include "chrome/browser/instant/instant_model.h" |
| 23 #include "chrome/browser/instant/instant_page.h" | 23 #include "chrome/browser/instant/instant_page.h" |
| 24 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" | 24 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" |
| 25 #include "chrome/common/instant_types.h" | 25 #include "chrome/common/instant_types.h" |
| 26 #include "chrome/common/search_types.h" | 26 #include "chrome/common/search_types.h" |
| 27 #include "content/public/browser/notification_observer.h" | 27 #include "content/public/browser/notification_observer.h" |
| 28 #include "content/public/browser/notification_registrar.h" | 28 #include "content/public/browser/notification_registrar.h" |
| 29 #include "content/public/common/page_transition_types.h" | 29 #include "content/public/common/page_transition_types.h" |
| 30 #include "googleurl/src/gurl.h" | 30 #include "googleurl/src/gurl.h" |
| 31 #include "ui/base/window_open_disposition.h" |
| 31 #include "ui/gfx/native_widget_types.h" | 32 #include "ui/gfx/native_widget_types.h" |
| 32 #include "ui/gfx/rect.h" | 33 #include "ui/gfx/rect.h" |
| 33 | 34 |
| 34 struct AutocompleteMatch; | 35 struct AutocompleteMatch; |
| 35 class AutocompleteProvider; | 36 class AutocompleteProvider; |
| 36 class InstantNTP; | 37 class InstantNTP; |
| 37 class InstantOverlay; | 38 class InstantOverlay; |
| 38 class InstantTab; | 39 class InstantTab; |
| 39 class TemplateURL; | 40 class TemplateURL; |
| 40 | 41 |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 InstantModel* model() { return &model_; } | 188 InstantModel* model() { return &model_; } |
| 188 | 189 |
| 189 private: | 190 private: |
| 190 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); | 191 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); |
| 191 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); | 192 FRIEND_TEST_ALL_PREFIXES(InstantTest, SetWithTemplateURL); |
| 192 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); | 193 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); |
| 193 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); | 194 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantOverlayRefresh); |
| 194 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); | 195 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ExtendedModeIsOn); |
| 195 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); | 196 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, MostVisited); |
| 196 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); | 197 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, OmniboxFocusLoadsInstant); |
| 198 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, |
| 199 MiddleClickOnSuggestionOpensInNewTab); |
| 197 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); | 200 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, NTPIsPreloaded); |
| 198 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); | 201 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInNewTab); |
| 199 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); | 202 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, PreloadedNTPIsUsedInSameTab); |
| 200 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); | 203 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, ProcessIsolation); |
| 201 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); | 204 FRIEND_TEST_ALL_PREFIXES(InstantExtendedTest, UnrelatedSiteInstance); |
| 202 | 205 |
| 203 // Overridden from content::NotificationObserver: | 206 // Overridden from content::NotificationObserver: |
| 204 virtual void Observe(int type, | 207 virtual void Observe(int type, |
| 205 const content::NotificationSource& source, | 208 const content::NotificationSource& source, |
| 206 const content::NotificationDetails& details) OVERRIDE; | 209 const content::NotificationDetails& details) OVERRIDE; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 225 const content::WebContents* contents, | 228 const content::WebContents* contents, |
| 226 InstantShownReason reason, | 229 InstantShownReason reason, |
| 227 int height, | 230 int height, |
| 228 InstantSizeUnits units) OVERRIDE; | 231 InstantSizeUnits units) OVERRIDE; |
| 229 virtual void StartCapturingKeyStrokes( | 232 virtual void StartCapturingKeyStrokes( |
| 230 const content::WebContents* contents) OVERRIDE; | 233 const content::WebContents* contents) OVERRIDE; |
| 231 virtual void StopCapturingKeyStrokes(content::WebContents* contents) OVERRIDE; | 234 virtual void StopCapturingKeyStrokes(content::WebContents* contents) OVERRIDE; |
| 232 virtual void NavigateToURL( | 235 virtual void NavigateToURL( |
| 233 const content::WebContents* contents, | 236 const content::WebContents* contents, |
| 234 const GURL& url, | 237 const GURL& url, |
| 235 content::PageTransition transition) OVERRIDE; | 238 content::PageTransition transition, |
| 239 WindowOpenDisposition disposition) OVERRIDE; |
| 236 | 240 |
| 237 // Invoked by the InstantLoader when the instant page wants to delete a | 241 // Invoked by the InstantLoader when the instant page wants to delete a |
| 238 // Most Visited item. | 242 // Most Visited item. |
| 239 virtual void DeleteMostVisitedItem(const GURL& url) OVERRIDE; | 243 virtual void DeleteMostVisitedItem(const GURL& url) OVERRIDE; |
| 240 | 244 |
| 241 // Invoked by the InstantLoader when the instant page wants to undo a | 245 // Invoked by the InstantLoader when the instant page wants to undo a |
| 242 // Most Visited deletion. | 246 // Most Visited deletion. |
| 243 virtual void UndoMostVisitedDeletion(const GURL& url) OVERRIDE; | 247 virtual void UndoMostVisitedDeletion(const GURL& url) OVERRIDE; |
| 244 | 248 |
| 245 // Invoked by the InstantLoader when the instant page wants to undo all | 249 // Invoked by the InstantLoader when the instant page wants to undo all |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 // Used for Top Sites async retrieval. | 438 // Used for Top Sites async retrieval. |
| 435 base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 439 base::WeakPtrFactory<InstantController> weak_ptr_factory_; |
| 436 | 440 |
| 437 // Used to get notifications about Most Visted changes. | 441 // Used to get notifications about Most Visted changes. |
| 438 content::NotificationRegistrar registrar_; | 442 content::NotificationRegistrar registrar_; |
| 439 | 443 |
| 440 DISALLOW_COPY_AND_ASSIGN(InstantController); | 444 DISALLOW_COPY_AND_ASSIGN(InstantController); |
| 441 }; | 445 }; |
| 442 | 446 |
| 443 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 447 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
| OLD | NEW |