From f9cfc4d02e387612c90385a5998af884975942a5 Mon Sep 17 00:00:00 2001 From: apacible Date: Mon, 17 Aug 2015 22:14:14 -0700 Subject: Support Component Actions in the toolbar. This change supports component actions in the toolbar, which previously only supported extension actions. ExtensionToolbarModel now keep track of extension ids (strings) rather than Extensions. This change also fixes the blank placement for the Media Router Action icon in new windows. BUG=511292, 511427, 511302 Review URL: https://codereview.chromium.org/1241063003 Cr-Commit-Position: refs/heads/master@{#343808} --- chrome/chrome_tests.gypi | 2 ++ 1 file changed, 2 insertions(+) (limited to 'chrome/chrome_tests.gypi') diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index ade51cc..51d8b7e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -522,6 +522,8 @@ 'browser/ui/toolbar/browser_actions_bar_browsertest.cc', 'browser/ui/toolbar/browser_actions_bar_browsertest.h', 'browser/ui/toolbar/component_toolbar_actions_browsertest.cc', + 'browser/ui/toolbar/mock_component_toolbar_actions_factory.cc', + 'browser/ui/toolbar/mock_component_toolbar_actions_factory.h', 'browser/ui/toolbar/test_toolbar_model.cc', 'browser/ui/toolbar/test_toolbar_model.h', 'browser/ui/website_settings/mock_permission_bubble_view.cc', -- cgit v1.1