OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tab_contents/tab_contents.h" | 5 #include "chrome/browser/tab_contents/tab_contents.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 | 8 |
9 #include "app/l10n_util.h" | 9 #include "app/l10n_util.h" |
10 #include "app/resource_bundle.h" | |
11 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
12 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
13 #include "base/metrics/stats_counters.h" | 12 #include "base/metrics/stats_counters.h" |
14 #include "base/string16.h" | 13 #include "base/string16.h" |
15 #include "base/string_util.h" | 14 #include "base/string_util.h" |
16 #include "base/time.h" | 15 #include "base/time.h" |
17 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
18 #include "chrome/browser/autocomplete_history_manager.h" | 17 #include "chrome/browser/autocomplete_history_manager.h" |
19 #include "chrome/browser/autofill/autofill_manager.h" | 18 #include "chrome/browser/autofill/autofill_manager.h" |
20 #include "chrome/browser/blocked_content_container.h" | 19 #include "chrome/browser/blocked_content_container.h" |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 #include "chrome/common/url_constants.h" | 95 #include "chrome/common/url_constants.h" |
97 #include "gfx/codec/png_codec.h" | 96 #include "gfx/codec/png_codec.h" |
98 #include "grit/chromium_strings.h" | 97 #include "grit/chromium_strings.h" |
99 #include "grit/generated_resources.h" | 98 #include "grit/generated_resources.h" |
100 #include "grit/locale_settings.h" | 99 #include "grit/locale_settings.h" |
101 #include "grit/platform_locale_settings.h" | 100 #include "grit/platform_locale_settings.h" |
102 #include "grit/theme_resources.h" | 101 #include "grit/theme_resources.h" |
103 #include "net/base/net_util.h" | 102 #include "net/base/net_util.h" |
104 #include "net/base/registry_controlled_domain.h" | 103 #include "net/base/registry_controlled_domain.h" |
105 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 104 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 105 #include "ui/base/resource/resource_bundle.h" |
106 #include "webkit/glue/password_form.h" | 106 #include "webkit/glue/password_form.h" |
107 #include "webkit/plugins/npapi/plugin_list.h" | 107 #include "webkit/plugins/npapi/plugin_list.h" |
108 #include "webkit/glue/webpreferences.h" | 108 #include "webkit/glue/webpreferences.h" |
109 | 109 |
110 #if defined(OS_MACOSX) | 110 #if defined(OS_MACOSX) |
111 #include "app/surface/io_surface_support_mac.h" | 111 #include "app/surface/io_surface_support_mac.h" |
112 #endif // defined(OS_MACOSX) | 112 #endif // defined(OS_MACOSX) |
113 | 113 |
114 #if defined(OS_CHROMEOS) | 114 #if defined(OS_CHROMEOS) |
115 #include "chrome/browser/chromeos/locale_change_guard.h" | 115 #include "chrome/browser/chromeos/locale_change_guard.h" |
(...skipping 3270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3386 if (pm != NULL) { | 3386 if (pm != NULL) { |
3387 if (pm->MaybeUsePreloadedPage(this, url)) { | 3387 if (pm->MaybeUsePreloadedPage(this, url)) { |
3388 // TODO(tburkard): If the preloaded page has not finished preloading | 3388 // TODO(tburkard): If the preloaded page has not finished preloading |
3389 // yet, we should not do this. | 3389 // yet, we should not do this. |
3390 DidStopLoading(); | 3390 DidStopLoading(); |
3391 return true; | 3391 return true; |
3392 } | 3392 } |
3393 } | 3393 } |
3394 return false; | 3394 return false; |
3395 } | 3395 } |
OLD | NEW |