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_UI_SEARCH_INSTANT_CONTROLLER_H_ |
6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
11 #include <utility> | 11 #include <utility> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
15 #include "base/gtest_prod_util.h" | 15 #include "base/gtest_prod_util.h" |
16 #include "base/memory/scoped_ptr.h" | 16 #include "base/memory/scoped_ptr.h" |
17 #include "base/string16.h" | 17 #include "base/string16.h" |
18 #include "base/time.h" | 18 #include "base/time.h" |
19 #include "base/timer.h" | 19 #include "base/timer.h" |
20 #include "chrome/browser/history/history_types.h" | 20 #include "chrome/browser/history/history_types.h" |
21 #include "chrome/browser/instant/instant_commit_type.h" | |
22 #include "chrome/browser/instant/instant_overlay_model.h" | |
23 #include "chrome/browser/instant/instant_page.h" | |
24 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" | 21 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" |
| 22 #include "chrome/browser/ui/search/instant_commit_type.h" |
| 23 #include "chrome/browser/ui/search/instant_overlay_model.h" |
| 24 #include "chrome/browser/ui/search/instant_page.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/base/window_open_disposition.h" |
32 #include "ui/gfx/native_widget_types.h" | 32 #include "ui/gfx/native_widget_types.h" |
33 #include "ui/gfx/rect.h" | 33 #include "ui/gfx/rect.h" |
34 | 34 |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
458 | 458 |
459 // Used for Top Sites async retrieval. | 459 // Used for Top Sites async retrieval. |
460 base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 460 base::WeakPtrFactory<InstantController> weak_ptr_factory_; |
461 | 461 |
462 // Used to get notifications about Most Visted changes. | 462 // Used to get notifications about Most Visted changes. |
463 content::NotificationRegistrar registrar_; | 463 content::NotificationRegistrar registrar_; |
464 | 464 |
465 DISALLOW_COPY_AND_ASSIGN(InstantController); | 465 DISALLOW_COPY_AND_ASSIGN(InstantController); |
466 }; | 466 }; |
467 | 467 |
468 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 468 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
OLD | NEW |