Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc

Issue 10701063: Cleanup gfx::Canvas now that 10562027 has landed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h" 5 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_context_menu_model.h" 9 #include "chrome/browser/extensions/extension_context_menu_model.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 26 matching lines...) Expand all
37 menu_runner_.reset(new views::MenuRunner(menu_)); 37 menu_runner_.reset(new views::MenuRunner(menu_));
38 menu_->set_has_icons(true); 38 menu_->set_has_icons(true);
39 39
40 size_t command_id = 1; // Menu id 0 is reserved, start with 1. 40 size_t command_id = 1; // Menu id 0 is reserved, start with 1.
41 for (size_t i = start_index; i < views_->size(); ++i) { 41 for (size_t i = start_index; i < views_->size(); ++i) {
42 BrowserActionView* view = (*views_)[i]; 42 BrowserActionView* view = (*views_)[i];
43 scoped_ptr<gfx::Canvas> canvas(view->GetIconWithBadge()); 43 scoped_ptr<gfx::Canvas> canvas(view->GetIconWithBadge());
44 menu_->AppendMenuItemWithIcon( 44 menu_->AppendMenuItemWithIcon(
45 command_id, 45 command_id,
46 UTF8ToUTF16(view->button()->extension()->name()), 46 UTF8ToUTF16(view->button()->extension()->name()),
47 canvas->ExtractBitmap()); 47 canvas->ExtractImageRep());
48 48
49 // Set the tooltip for this item. 49 // Set the tooltip for this item.
50 string16 tooltip = UTF8ToUTF16( 50 string16 tooltip = UTF8ToUTF16(
51 view->button()->extension()->browser_action()->GetTitle( 51 view->button()->extension()->browser_action()->GetTitle(
52 owner_->GetCurrentTabId())); 52 owner_->GetCurrentTabId()));
53 menu_->SetTooltip(tooltip, command_id); 53 menu_->SetTooltip(tooltip, command_id);
54 54
55 ++command_id; 55 ++command_id;
56 } 56 }
57 } 57 }
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 BrowserActionView* BrowserActionOverflowMenuController::ViewForId( 214 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
215 int id, size_t* index) { 215 int id, size_t* index) {
216 // The index of the view being dragged (GetCommand gives a 1-based index into 216 // The index of the view being dragged (GetCommand gives a 1-based index into
217 // the overflow menu). 217 // the overflow menu).
218 size_t view_index = owner_->VisibleBrowserActions() + id - 1; 218 size_t view_index = owner_->VisibleBrowserActions() + id - 1;
219 if (index) 219 if (index)
220 *index = view_index; 220 *index = view_index;
221 return owner_->GetBrowserActionViewAt(view_index); 221 return owner_->GetBrowserActionViewAt(view_index);
222 } 222 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698