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

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

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof of concept Created 8 years, 3 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_action.h"
9 #include "chrome/browser/extensions/extension_context_menu_model.h" 10 #include "chrome/browser/extensions/extension_context_menu_model.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser_list.h" 12 #include "chrome/browser/ui/browser_list.h"
12 #include "chrome/browser/ui/views/browser_action_view.h" 13 #include "chrome/browser/ui/views/browser_action_view.h"
13 #include "chrome/browser/ui/views/browser_actions_container.h" 14 #include "chrome/browser/ui/views/browser_actions_container.h"
14 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" 15 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
15 #include "chrome/common/extensions/extension.h" 16 #include "chrome/common/extensions/extension.h"
16 #include "chrome/common/extensions/extension_action.h"
17 #include "ui/gfx/canvas.h" 17 #include "ui/gfx/canvas.h"
18 #include "ui/views/controls/menu/menu_item_view.h" 18 #include "ui/views/controls/menu/menu_item_view.h"
19 #include "ui/views/controls/menu/menu_model_adapter.h" 19 #include "ui/views/controls/menu/menu_model_adapter.h"
20 #include "ui/views/controls/menu/menu_runner.h" 20 #include "ui/views/controls/menu/menu_runner.h"
21 #include "ui/views/controls/menu/submenu_view.h" 21 #include "ui/views/controls/menu/submenu_view.h"
22 #include "ui/views/widget/widget.h" 22 #include "ui/views/widget/widget.h"
23 23
24 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController( 24 BrowserActionOverflowMenuController::BrowserActionOverflowMenuController(
25 BrowserActionsContainer* owner, 25 BrowserActionsContainer* owner,
26 Browser* browser, 26 Browser* browser,
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 BrowserActionView* BrowserActionOverflowMenuController::ViewForId( 221 BrowserActionView* BrowserActionOverflowMenuController::ViewForId(
222 int id, size_t* index) { 222 int id, size_t* index) {
223 // The index of the view being dragged (GetCommand gives a 1-based index into 223 // The index of the view being dragged (GetCommand gives a 1-based index into
224 // the overflow menu). 224 // the overflow menu).
225 size_t view_index = owner_->VisibleBrowserActions() + id - 1; 225 size_t view_index = owner_->VisibleBrowserActions() + id - 1;
226 if (index) 226 if (index)
227 *index = view_index; 227 *index = view_index;
228 return owner_->GetBrowserActionViewAt(view_index); 228 return owner_->GetBrowserActionViewAt(view_index);
229 } 229 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698