chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc - Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

Issue 9562038: ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more two win fixes Created 8 years, 9 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

index a7f2c0b3782f31920585c851a07b35cb41b51419..a7396dc50f9c822146fb71ef16ae2457abf6503a 100644

--- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

+++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

@@ -13,7 +13,7 @@

#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_action.h"

-#include "ui/gfx/canvas_skia.h"

+#include "ui/gfx/canvas.h"

#include "ui/views/controls/menu/menu_item_view.h"

#include "ui/views/controls/menu/menu_model_adapter.h"

#include "ui/views/controls/menu/menu_runner.h"

@@ -43,7 +43,7 @@ BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(

menu_->AppendMenuItemWithIcon(

command_id,

UTF8ToUTF16(view->button()->extension()->name()),

- canvas->AsCanvasSkia()->ExtractBitmap());

+ canvas->ExtractBitmap());

// Set the tooltip for this item.

string16 tooltip = UTF8ToUTF16(

« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_view.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »