| Index: chrome/browser/toolbar_model.cc
|
| ===================================================================
|
| --- chrome/browser/toolbar_model.cc (revision 11592)
|
| +++ chrome/browser/toolbar_model.cc (working copy)
|
| @@ -15,6 +15,7 @@
|
| #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) {
|
| @@ -107,6 +108,21 @@
|
| }
|
| }
|
|
|
| +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.
|
|
|