Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 #include "chrome/common/extensions/extension_icon_set.h" 88 #include "chrome/common/extensions/extension_icon_set.h"
89 #include "chrome/common/extensions/extension_resource.h" 89 #include "chrome/common/extensions/extension_resource.h"
90 #include "chrome/common/extensions/url_pattern.h" 90 #include "chrome/common/extensions/url_pattern.h"
91 #include "chrome/common/navigation_types.h" 91 #include "chrome/common/navigation_types.h"
92 #include "chrome/common/net/url_request_context_getter.h" 92 #include "chrome/common/net/url_request_context_getter.h"
93 #include "chrome/common/notification_service.h" 93 #include "chrome/common/notification_service.h"
94 #include "chrome/common/pref_names.h" 94 #include "chrome/common/pref_names.h"
95 #include "chrome/common/render_messages.h" 95 #include "chrome/common/render_messages.h"
96 #include "chrome/common/render_messages_params.h" 96 #include "chrome/common/render_messages_params.h"
97 #include "chrome/common/url_constants.h" 97 #include "chrome/common/url_constants.h"
98 #include "gfx/codec/png_codec.h"
99 #include "grit/chromium_strings.h" 98 #include "grit/chromium_strings.h"
100 #include "grit/generated_resources.h" 99 #include "grit/generated_resources.h"
101 #include "grit/locale_settings.h" 100 #include "grit/locale_settings.h"
102 #include "grit/platform_locale_settings.h" 101 #include "grit/platform_locale_settings.h"
103 #include "grit/theme_resources.h" 102 #include "grit/theme_resources.h"
104 #include "net/base/net_util.h" 103 #include "net/base/net_util.h"
105 #include "net/base/registry_controlled_domain.h" 104 #include "net/base/registry_controlled_domain.h"
106 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 105 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
107 #include "ui/base/l10n/l10n_util.h" 106 #include "ui/base/l10n/l10n_util.h"
108 #include "ui/base/resource/resource_bundle.h" 107 #include "ui/base/resource/resource_bundle.h"
108 #include "ui/gfx/codec/png_codec.h"
109 #include "webkit/glue/password_form.h" 109 #include "webkit/glue/password_form.h"
110 #include "webkit/glue/webpreferences.h" 110 #include "webkit/glue/webpreferences.h"
111 111
112 #if defined(OS_MACOSX) 112 #if defined(OS_MACOSX)
113 #include "app/surface/io_surface_support_mac.h" 113 #include "app/surface/io_surface_support_mac.h"
114 #endif // defined(OS_MACOSX) 114 #endif // defined(OS_MACOSX)
115 115
116 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
117 #include "chrome/browser/chromeos/locale_change_guard.h" 117 #include "chrome/browser/chromeos/locale_change_guard.h"
118 #endif // defined(OS_CHROMEOS) 118 #endif // defined(OS_CHROMEOS)
(...skipping 3022 matching lines...) Expand 10 before | Expand all | Expand 10 after
3141 } 3141 }
3142 3142
3143 bool TabContents::MaybeUsePreloadedPage(const GURL& url) { 3143 bool TabContents::MaybeUsePreloadedPage(const GURL& url) {
3144 PrerenderManager* pm = profile()->GetPrerenderManager(); 3144 PrerenderManager* pm = profile()->GetPrerenderManager();
3145 if (pm != NULL) { 3145 if (pm != NULL) {
3146 if (pm->MaybeUsePreloadedPage(this, url)) 3146 if (pm->MaybeUsePreloadedPage(this, url))
3147 return true; 3147 return true;
3148 } 3148 }
3149 return false; 3149 return false;
3150 } 3150 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/browser/tab_contents/tab_contents_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698