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

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: Fix compile error for clank mac and unit test memory leak Created 9 years, 8 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
« no previous file with comments | « chrome/common/render_messages.h ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 virtual bool IsExternalTabContainer() const; 876 virtual bool IsExternalTabContainer() const;
877 virtual void DidInsertCSS(); 877 virtual void DidInsertCSS();
878 virtual void FocusedNodeChanged(bool is_editable_node); 878 virtual void FocusedNodeChanged(bool is_editable_node);
879 virtual void UpdateZoomLimits(int minimum_percent, 879 virtual void UpdateZoomLimits(int minimum_percent,
880 int maximum_percent, 880 int maximum_percent,
881 bool remember); 881 bool remember);
882 virtual void WorkerCrashed(); 882 virtual void WorkerCrashed();
883 virtual void RequestDesktopNotificationPermission(const GURL& source_origin, 883 virtual void RequestDesktopNotificationPermission(const GURL& source_origin,
884 int callback_context); 884 int callback_context);
885 885
886 void OnUpdateFaviconURL(int32 page_id,
887 const std::vector<FaviconURL>& candidates);
886 // RenderViewHostManager::Delegate ------------------------------------------- 888 // RenderViewHostManager::Delegate -------------------------------------------
887 889
888 // Blocks/unblocks interaction with renderer process. 890 // Blocks/unblocks interaction with renderer process.
889 void BlockTabContent(bool blocked); 891 void BlockTabContent(bool blocked);
890 892
891 virtual void BeforeUnloadFiredFromRenderManager( 893 virtual void BeforeUnloadFiredFromRenderManager(
892 bool proceed, 894 bool proceed,
893 bool* proceed_to_fire_unload); 895 bool* proceed_to_fire_unload);
894 virtual void DidStartLoadingFromRenderManager( 896 virtual void DidStartLoadingFromRenderManager(
895 RenderViewHost* render_view_host); 897 RenderViewHost* render_view_host);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
955 957
956 // TabContentsSSLHelper, lazily created. 958 // TabContentsSSLHelper, lazily created.
957 scoped_ptr<TabContentsSSLHelper> ssl_helper_; 959 scoped_ptr<TabContentsSSLHelper> ssl_helper_;
958 960
959 // Handles drag and drop event forwarding to extensions. 961 // Handles drag and drop event forwarding to extensions.
960 BookmarkDrag* bookmark_drag_; 962 BookmarkDrag* bookmark_drag_;
961 963
962 // Handles downloading favicons. 964 // Handles downloading favicons.
963 scoped_ptr<FaviconHelper> favicon_helper_; 965 scoped_ptr<FaviconHelper> favicon_helper_;
964 966
967 // Handles downloading touchicons. It is NULL if
968 // browser_defaults::kEnableTouchIcon is false.
969 scoped_ptr<FaviconHelper> touch_icon_helper_;
970
965 // RenderViewHost::ContentSettingsDelegate. 971 // RenderViewHost::ContentSettingsDelegate.
966 scoped_ptr<TabSpecificContentSettings> content_settings_delegate_; 972 scoped_ptr<TabSpecificContentSettings> content_settings_delegate_;
967 973
968 // Handles IPCs related to SafeBrowsing client-side phishing detection. 974 // Handles IPCs related to SafeBrowsing client-side phishing detection.
969 scoped_ptr<safe_browsing::ClientSideDetectionHost> 975 scoped_ptr<safe_browsing::ClientSideDetectionHost>
970 safebrowsing_detection_host_; 976 safebrowsing_detection_host_;
971 977
972 // Data for loading state ---------------------------------------------------- 978 // Data for loading state ----------------------------------------------------
973 979
974 // Indicates whether we're currently loading a resource. 980 // Indicates whether we're currently loading a resource.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1105 ObserverList<TabContentsObserver> observers_; 1111 ObserverList<TabContentsObserver> observers_;
1106 1112
1107 // Content restrictions, used to disable print/copy etc based on content's 1113 // Content restrictions, used to disable print/copy etc based on content's
1108 // (full-page plugins for now only) permissions. 1114 // (full-page plugins for now only) permissions.
1109 int content_restrictions_; 1115 int content_restrictions_;
1110 1116
1111 DISALLOW_COPY_AND_ASSIGN(TabContents); 1117 DISALLOW_COPY_AND_ASSIGN(TabContents);
1112 }; 1118 };
1113 1119
1114 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1120 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/common/render_messages.h ('k') | content/browser/tab_contents/tab_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698