diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 22:48:08 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 22:48:08 +0000 |
| commit | cbc0e9cc6651df9bb4a256c30c7d4a8fce36d066 (patch) | |
| tree | 04db665d0a50888ece0b9e5c83695b7860381827 /chrome/browser/toolbar_model.cc | |
| parent | 81cf6f77e3bf3a413220d9b28ba83d85567d9048 (diff) | |
| download | chromium_src-cbc0e9cc6651df9bb4a256c30c7d4a8fce36d066.zip chromium_src-cbc0e9cc6651df9bb4a256c30c7d4a8fce36d066.tar.gz chromium_src-cbc0e9cc6651df9bb4a256c30c7d4a8fce36d066.tar.bz2 | |
Fix bug 9812: Remove current RSS code in favor of new more generalized
PageAction code that serves the same purpose (and more).
BUG=9812
TEST=No test needed, this shouldn't result in any noticable difference
since the RSS parsing was disabled.
Review URL: http://codereview.chromium.org/100356
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/toolbar_model.cc')
| -rw-r--r-- | chrome/browser/toolbar_model.cc | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index 3dc574a..4f9c98e 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -15,8 +15,6 @@ #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "webkit/glue/feed.h" - ToolbarModel::ToolbarModel() : input_in_progress_(false) { } @@ -108,21 +106,6 @@ ToolbarModel::Icon ToolbarModel::GetIcon() { } } -scoped_refptr<FeedList> ToolbarModel::GetFeedList() { - if (input_in_progress_) - return NULL; - - NavigationController* navigation_controller = GetNavigationController(); - if (!navigation_controller) // We might not have a controller on init. - return NULL; - - NavigationEntry* entry = navigation_controller->GetActiveEntry(); - if (!entry) - return NULL; - - return entry->feedlist(); -} - void ToolbarModel::GetIconHoverText(std::wstring* text, SkColor* text_color) { static const SkColor kOKHttpsInfoBubbleTextColor = SkColorSetRGB(0, 153, 51); // Green. |