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

Side by Side Diff: content/browser/tab_contents/tab_contents.h

Issue 6672065: Support touch icon in FaviconHelper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only update the FAVICON data to the NavigationEntry. Created 9 years, 9 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 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <map> 10 #include <map>
(...skipping 1064 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 1075
1076 // TabContentsSSLHelper, lazily created. 1076 // TabContentsSSLHelper, lazily created.
1077 scoped_ptr<TabContentsSSLHelper> ssl_helper_; 1077 scoped_ptr<TabContentsSSLHelper> ssl_helper_;
1078 1078
1079 // Handles drag and drop event forwarding to extensions. 1079 // Handles drag and drop event forwarding to extensions.
1080 BookmarkDrag* bookmark_drag_; 1080 BookmarkDrag* bookmark_drag_;
1081 1081
1082 // Handles downloading favicons. 1082 // Handles downloading favicons.
1083 scoped_ptr<FaviconHelper> favicon_helper_; 1083 scoped_ptr<FaviconHelper> favicon_helper_;
1084 1084
1085 // Handles downloading touchicons.
1086 scoped_ptr<FaviconHelper> touch_icon_helper_;
1087
1085 // Cached web app info data. 1088 // Cached web app info data.
1086 WebApplicationInfo web_app_info_; 1089 WebApplicationInfo web_app_info_;
1087 1090
1088 // Cached web app icon. 1091 // Cached web app icon.
1089 SkBitmap app_icon_; 1092 SkBitmap app_icon_;
1090 1093
1091 // RenderViewHost::ContentSettingsDelegate. 1094 // RenderViewHost::ContentSettingsDelegate.
1092 scoped_ptr<TabSpecificContentSettings> content_settings_delegate_; 1095 scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
1093 1096
1094 // Handles desktop notification IPCs. 1097 // Handles desktop notification IPCs.
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 ObserverList<TabContentsObserver> observers_; 1249 ObserverList<TabContentsObserver> observers_;
1247 1250
1248 // Content restrictions, used to disable print/copy etc based on content's 1251 // Content restrictions, used to disable print/copy etc based on content's
1249 // (full-page plugins for now only) permissions. 1252 // (full-page plugins for now only) permissions.
1250 int content_restrictions_; 1253 int content_restrictions_;
1251 1254
1252 DISALLOW_COPY_AND_ASSIGN(TabContents); 1255 DISALLOW_COPY_AND_ASSIGN(TabContents);
1253 }; 1256 };
1254 1257
1255 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1258 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698