| Index: chrome/browser/ui/toolbar/media_router_action.cc
|
| diff --git a/chrome/browser/ui/toolbar/media_router_action.cc b/chrome/browser/ui/toolbar/media_router_action.cc
|
| index 3189f3ae7ffb60b9b5fcd3118561693369bced63..73a6a40c21f761c07c24471de763a805ec3f0a74 100644
|
| --- a/chrome/browser/ui/toolbar/media_router_action.cc
|
| +++ b/chrome/browser/ui/toolbar/media_router_action.cc
|
| @@ -34,17 +34,12 @@ void MediaRouterAction::SetDelegate(ToolbarActionViewDelegate* delegate) {
|
| delegate_ = delegate;
|
| }
|
|
|
| -gfx::Image MediaRouterAction::GetIcon(
|
| - content::WebContents* web_contents) {
|
| +gfx::Image MediaRouterAction::GetIcon(content::WebContents* web_contents,
|
| + const gfx::Size& size) {
|
| // TODO(apacible): Return icon based on casting state.
|
| return media_router_idle_icon_;
|
| }
|
|
|
| -gfx::ImageSkia MediaRouterAction::GetIconWithBadge() {
|
| - DCHECK(delegate_);
|
| - return *GetIcon(delegate_->GetCurrentWebContents()).ToImageSkia();
|
| -}
|
| -
|
| base::string16 MediaRouterAction::GetActionName() const {
|
| return name_;
|
| }
|
|
|