OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "chrome/browser/instant/instant_loader.h" | 5 #include "chrome/browser/instant/instant_loader.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> |
8 #include <utility> | 9 #include <utility> |
| 10 #include <vector> |
9 | 11 |
10 #include "app/l10n_util.h" | 12 #include "app/l10n_util.h" |
11 #include "base/command_line.h" | 13 #include "base/command_line.h" |
12 #include "base/string_number_conversions.h" | 14 #include "base/string_number_conversions.h" |
13 #include "base/timer.h" | 15 #include "base/timer.h" |
14 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
15 #include "base/values.h" | 17 #include "base/values.h" |
16 #include "chrome/browser/favicon_service.h" | 18 #include "chrome/browser/favicon_service.h" |
17 #include "chrome/browser/history/history_marshaling.h" | 19 #include "chrome/browser/history/history_marshaling.h" |
18 #include "chrome/browser/instant/instant_loader_delegate.h" | 20 #include "chrome/browser/instant/instant_loader_delegate.h" |
19 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/renderer_host/render_view_host.h" | 22 #include "chrome/browser/renderer_host/render_view_host.h" |
21 #include "chrome/browser/renderer_host/render_widget_host.h" | 23 #include "chrome/browser/renderer_host/render_widget_host.h" |
22 #include "chrome/browser/renderer_host/render_widget_host_view.h" | 24 #include "chrome/browser/renderer_host/render_widget_host_view.h" |
23 #include "chrome/browser/search_engines/template_url.h" | 25 #include "chrome/browser/search_engines/template_url.h" |
24 #include "chrome/browser/tab_contents/navigation_controller.h" | 26 #include "chrome/browser/tab_contents/navigation_controller.h" |
25 #include "chrome/browser/tab_contents/navigation_entry.h" | 27 #include "chrome/browser/tab_contents/navigation_entry.h" |
26 #include "chrome/browser/tab_contents/tab_contents.h" | 28 #include "chrome/browser/tab_contents/tab_contents.h" |
27 #include "chrome/browser/tab_contents/tab_contents_delegate.h" | 29 #include "chrome/browser/tab_contents/tab_contents_delegate.h" |
28 #include "chrome/browser/tab_contents/tab_contents_view.h" | 30 #include "chrome/browser/tab_contents/tab_contents_view.h" |
29 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 31 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
30 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
| 33 #include "chrome/common/notification_details.h" |
31 #include "chrome/common/notification_observer.h" | 34 #include "chrome/common/notification_observer.h" |
32 #include "chrome/common/notification_registrar.h" | 35 #include "chrome/common/notification_registrar.h" |
33 #include "chrome/common/notification_service.h" | 36 #include "chrome/common/notification_source.h" |
34 #include "chrome/common/notification_type.h" | 37 #include "chrome/common/notification_type.h" |
35 #include "chrome/common/page_transition_types.h" | 38 #include "chrome/common/page_transition_types.h" |
36 #include "chrome/common/render_messages.h" | 39 #include "chrome/common/render_messages.h" |
37 #include "chrome/common/renderer_preferences.h" | 40 #include "chrome/common/renderer_preferences.h" |
38 #include "gfx/codec/png_codec.h" | 41 #include "gfx/codec/png_codec.h" |
39 #include "ipc/ipc_message.h" | 42 #include "ipc/ipc_message.h" |
40 #include "net/http/http_util.h" | 43 #include "net/http/http_util.h" |
41 | 44 |
42 namespace { | 45 namespace { |
43 | 46 |
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
811 Source<NavigationController>(&preview_contents_->controller())); | 814 Source<NavigationController>(&preview_contents_->controller())); |
812 #endif | 815 #endif |
813 | 816 |
814 registrar_.Add( | 817 registrar_.Add( |
815 this, | 818 this, |
816 NotificationType::NAV_ENTRY_COMMITTED, | 819 NotificationType::NAV_ENTRY_COMMITTED, |
817 Source<NavigationController>(&preview_contents_->controller())); | 820 Source<NavigationController>(&preview_contents_->controller())); |
818 | 821 |
819 preview_contents_->tab_contents()->ShowContents(); | 822 preview_contents_->tab_contents()->ShowContents(); |
820 } | 823 } |
OLD | NEW |