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_TAB_H_ | 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_TAB_H_ |
6 #define CHROME_BROWSER_INSTANT_INSTANT_TAB_H_ | 6 #define CHROME_BROWSER_INSTANT_INSTANT_TAB_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/string16.h" | 12 #include "base/string16.h" |
13 #include "chrome/browser/instant/instant_client.h" | 13 #include "chrome/browser/instant/instant_client.h" |
14 #include "webkit/glue/window_open_disposition.h" | |
sreeram
2013/01/22 06:01:19
Same here. No need for this include.
dougw
2013/01/24 03:05:25
Done.
| |
14 | 15 |
15 struct InstantAutocompleteResult; | 16 struct InstantAutocompleteResult; |
16 class InstantController; | 17 class InstantController; |
17 | 18 |
18 namespace content { | 19 namespace content { |
19 class WebContents; | 20 class WebContents; |
20 } | 21 } |
21 | 22 |
22 // InstantTab is used to communicate with a committed search results page, i.e., | 23 // InstantTab is used to communicate with a committed search results page, i.e., |
23 // an actual tab on the tab strip (compare: InstantLoader, which has a preview | 24 // an actual tab on the tab strip (compare: InstantLoader, which has a preview |
(...skipping 28 matching lines...) Expand all Loading... | |
52 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; | 53 const std::vector<InstantSuggestion>& suggestions) OVERRIDE; |
53 virtual void InstantSupportDetermined(bool supports_instant) OVERRIDE; | 54 virtual void InstantSupportDetermined(bool supports_instant) OVERRIDE; |
54 virtual void ShowInstantPreview(InstantShownReason reason, | 55 virtual void ShowInstantPreview(InstantShownReason reason, |
55 int height, | 56 int height, |
56 InstantSizeUnits units) OVERRIDE; | 57 InstantSizeUnits units) OVERRIDE; |
57 virtual void StartCapturingKeyStrokes() OVERRIDE; | 58 virtual void StartCapturingKeyStrokes() OVERRIDE; |
58 virtual void StopCapturingKeyStrokes() OVERRIDE; | 59 virtual void StopCapturingKeyStrokes() OVERRIDE; |
59 virtual void RenderViewGone() OVERRIDE; | 60 virtual void RenderViewGone() OVERRIDE; |
60 virtual void AboutToNavigateMainFrame(const GURL& url) OVERRIDE; | 61 virtual void AboutToNavigateMainFrame(const GURL& url) OVERRIDE; |
61 virtual void NavigateToURL(const GURL& url, | 62 virtual void NavigateToURL(const GURL& url, |
62 content::PageTransition transition) OVERRIDE; | 63 content::PageTransition transition, |
64 WindowOpenDisposition disposition) OVERRIDE; | |
63 | 65 |
64 InstantClient client_; | 66 InstantClient client_; |
65 InstantController* const controller_; | 67 InstantController* const controller_; |
66 content::WebContents* const contents_; | 68 content::WebContents* const contents_; |
67 bool supports_instant_; | 69 bool supports_instant_; |
68 | 70 |
69 DISALLOW_COPY_AND_ASSIGN(InstantTab); | 71 DISALLOW_COPY_AND_ASSIGN(InstantTab); |
70 }; | 72 }; |
71 | 73 |
72 #endif // CHROME_BROWSER_INSTANT_INSTANT_TAB_H_ | 74 #endif // CHROME_BROWSER_INSTANT_INSTANT_TAB_H_ |
OLD | NEW |