diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 14:17:59 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 14:17:59 +0000 |
| commit | 74e51408fd3361b11d3e981cab925a6ed960c905 (patch) | |
| tree | 207f46b92ac628f1b50fea7ebf34b17febb66cf5 /content | |
| parent | aff6cda58f0574ccd44342d644d890beef2ac24f (diff) | |
| download | chromium_src-74e51408fd3361b11d3e981cab925a6ed960c905.zip chromium_src-74e51408fd3361b11d3e981cab925a6ed960c905.tar.gz chromium_src-74e51408fd3361b11d3e981cab925a6ed960c905.tar.bz2 | |
Last of the app icons.
Move the non-extension app icon code to extension_tab_helper, merge with extension app code.
BUG=71097
TEST=no visible change
Review URL: http://codereview.chromium.org/6792059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/tab_contents/tab_contents.cc | 5 | ||||
| -rw-r--r-- | content/browser/tab_contents/tab_contents.h | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index d0ff14b..5ae27de 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -2513,11 +2513,6 @@ void TabContents::set_encoding(const std::string& encoding) { encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding); } -void TabContents::SetAppIcon(const SkBitmap& app_icon) { - app_icon_ = app_icon; - NotifyNavigationStateChanged(INVALIDATE_TITLE); -} - void TabContents::SwapInRenderViewHost(RenderViewHost* rvh) { render_manager_.SwapInRenderViewHost(rvh); } diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 1ef7c86..09187c4 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -21,7 +21,6 @@ #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/common/instant_types.h" #include "chrome/common/translate_errors.h" -#include "chrome/common/web_apps.h" #include "content/browser/renderer_host/render_view_host_delegate.h" #include "content/browser/tab_contents/constrained_window.h" #include "content/browser/tab_contents/language_state.h" @@ -219,12 +218,6 @@ class TabContents : public PageNavigator, encoding_.clear(); } - const SkBitmap& app_icon() const { return app_icon_; } - - // Sets an app icon associated with TabContents and fires an INVALIDATE_TITLE - // navigation state change to trigger repaint of title. - void SetAppIcon(const SkBitmap& app_icon); - bool displayed_insecure_content() const { return displayed_insecure_content_; } @@ -960,9 +953,6 @@ class TabContents : public PageNavigator, // Handles drag and drop event forwarding to extensions. BookmarkDrag* bookmark_drag_; - // Cached web app icon. - SkBitmap app_icon_; - // RenderViewHost::ContentSettingsDelegate. scoped_ptr<TabSpecificContentSettings> content_settings_delegate_; |