chrome/browser/ui/views/toolbar/chevron_menu_button.cc - Issue 1241063003: Support Component Actions in the toolbar.

Side by Side Diff: chrome/browser/ui/views/toolbar/chevron_menu_button.cc

Issue 1241063003: Support Component Actions in the toolbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Changes per mfoltz@'s comments. Created 5 years, 4 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

« chrome/browser/ui/toolbar/toolbar_actions_model.cc ('K') | « chrome/browser/ui/views/toolbar/browser_actions_container_browsertest.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/toolbar/chevron_menu_button.h"	5 #include "chrome/browser/ui/views/toolbar/chevron_menu_button.h"

6	6

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

8 #include "base/memory/scoped_vector.h"	8 #include "base/memory/scoped_vector.h"

9 #include "base/single_thread_task_runner.h"	9 #include "base/single_thread_task_runner.h"

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_conversions.h"

11 #include "base/thread_task_runner_handle.h"	11 #include "base/thread_task_runner_handle.h"

12 #include "chrome/browser/extensions/extension_action.h"	12 #include "chrome/browser/extensions/extension_action.h"

13 #include "chrome/browser/extensions/extension_action_icon_factory.h"	13 #include "chrome/browser/extensions/extension_action_icon_factory.h"

14 #include "chrome/browser/extensions/extension_context_menu_model.h"	14 #include "chrome/browser/extensions/extension_context_menu_model.h"

15 #include "chrome/browser/extensions/extension_toolbar_model.h"

16 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/ui/browser.h"	16 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"	17 #include "chrome/browser/ui/extensions/extension_action_view_controller.h"

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

20 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"	19 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"

21 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"	20 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"

22 #include "extensions/common/extension.h"	21 #include "extensions/common/extension.h"

23 #include "ui/views/border.h"	22 #include "ui/views/border.h"

24 #include "ui/views/controls/button/label_button_border.h"	23 #include "ui/views/controls/button/label_button_border.h"

25 #include "ui/views/controls/menu/menu_delegate.h"	24 #include "ui/views/controls/menu/menu_delegate.h"

(...skipping 413 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
439 // We should never try to show an overflow menu when one is already visible.	438 // We should never try to show an overflow menu when one is already visible.

440 DCHECK(!menu_controller_);	439 DCHECK(!menu_controller_);

441 menu_controller_.reset(new MenuController(	440 menu_controller_.reset(new MenuController(

442 this, browser_actions_container_, for_drop));	441 this, browser_actions_container_, for_drop));

443 menu_controller_->RunMenu(GetWidget());	442 menu_controller_->RunMenu(GetWidget());

444 }	443 }

445	444

446 void ChevronMenuButton::MenuDone() {	445 void ChevronMenuButton::MenuDone() {

447 menu_controller_.reset();	446 menu_controller_.reset();

448 }	447 }

OLD	NEW