chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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

« no previous file with comments | « chrome/browser/ui/views/extensions/browser_action_drag_data_unittest.cc ('k') | chrome/browser/ui/views/extensions/extension_install_prompt.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/extensions/browser_action_overflow_menu_controlle r.h"	5 #include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_contro ller.h"

6	6

7 #include "base/utf_string_conversions.h"	7 #include "base/utf_string_conversions.h"

8 #include "chrome/browser/browser_list.h"	8 #include "chrome/browser/browser_list.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"

11 #include "chrome/browser/views/browser_actions_container.h"	11 #include "chrome/browser/ui/views/browser_actions_container.h"

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

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

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

15 #include "gfx/canvas_skia.h"	15 #include "gfx/canvas_skia.h"

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

17 #include "views/controls/menu/menu_2.h"	17 #include "views/controls/menu/menu_2.h"

18	18

19 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(	19 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(

20 BrowserActionsContainer* owner,	20 BrowserActionsContainer* owner,

21 views::MenuButton* menu_button,	21 views::MenuButton* menu_button,

22 const std::vector<BrowserActionView*>& views,	22 const std::vector<BrowserActionView*>& views,

(...skipping 176 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
199	199

200 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(	200 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(

201 int id, size_t* index) {	201 int id, size_t* index) {

202 // The index of the view being dragged (GetCommand gives a 1-based index into	202 // The index of the view being dragged (GetCommand gives a 1-based index into

203 // the overflow menu).	203 // the overflow menu).

204 size_t view_index = owner_->VisibleBrowserActions() + id - 1;	204 size_t view_index = owner_->VisibleBrowserActions() + id - 1;

205 if (index)	205 if (index)

206 *index = view_index;	206 *index = view_index;

207 return owner_->GetBrowserActionViewAt(view_index);	207 return owner_->GetBrowserActionViewAt(view_index);

208 }	208 }

OLD	NEW