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_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 <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <list> | 10 #include <list> |
| 11 #include <memory> |
11 #include <string> | 12 #include <string> |
12 #include <utility> | 13 #include <utility> |
13 #include <vector> | 14 #include <vector> |
14 | 15 |
15 #include "base/gtest_prod_util.h" | 16 #include "base/gtest_prod_util.h" |
16 #include "base/macros.h" | 17 #include "base/macros.h" |
17 #include "base/memory/scoped_ptr.h" | |
18 #include "base/strings/string16.h" | 18 #include "base/strings/string16.h" |
19 #include "chrome/browser/ui/search/instant_page.h" | 19 #include "chrome/browser/ui/search/instant_page.h" |
20 #include "chrome/common/search_types.h" | 20 #include "chrome/common/search_types.h" |
21 #include "ui/gfx/native_widget_types.h" | 21 #include "ui/gfx/native_widget_types.h" |
22 | 22 |
23 class BrowserInstantController; | 23 class BrowserInstantController; |
24 class GURL; | 24 class GURL; |
25 class InstantService; | 25 class InstantService; |
26 class InstantTab; | 26 class InstantTab; |
27 class Profile; | 27 class Profile; |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 | 134 |
135 // Sends theme info, omnibox bounds, etc. down to the Instant tab. | 135 // Sends theme info, omnibox bounds, etc. down to the Instant tab. |
136 void UpdateInfoForInstantTab(); | 136 void UpdateInfoForInstantTab(); |
137 | 137 |
138 // Returns the InstantService for the browser profile. | 138 // Returns the InstantService for the browser profile. |
139 InstantService* GetInstantService() const; | 139 InstantService* GetInstantService() const; |
140 | 140 |
141 BrowserInstantController* const browser_; | 141 BrowserInstantController* const browser_; |
142 | 142 |
143 // The instance of InstantPage maintained by InstantController. | 143 // The instance of InstantPage maintained by InstantController. |
144 scoped_ptr<InstantTab> instant_tab_; | 144 std::unique_ptr<InstantTab> instant_tab_; |
145 | 145 |
146 // The search model mode for the active tab. | 146 // The search model mode for the active tab. |
147 SearchMode search_mode_; | 147 SearchMode search_mode_; |
148 | 148 |
149 // List of events and their timestamps, useful in debugging Instant behaviour. | 149 // List of events and their timestamps, useful in debugging Instant behaviour. |
150 mutable std::list<std::pair<int64_t, std::string>> debug_events_; | 150 mutable std::list<std::pair<int64_t, std::string>> debug_events_; |
151 | 151 |
152 DISALLOW_COPY_AND_ASSIGN(InstantController); | 152 DISALLOW_COPY_AND_ASSIGN(InstantController); |
153 }; | 153 }; |
154 | 154 |
155 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 155 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
OLD | NEW |