Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/media_router_contextual_menu.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/media_router_contextual_menu.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/metrics/user_metrics.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/constants.h"
 #include "ui/base/models/menu_model_delegate.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"

[apacible, 2017/02/24 19:51:22]

Is this needed?

[takumif, 2017/02/24 19:56:56]

Yes, this confused me a bit too. This file included
component_toolbar_actions_factory.h that included toolbar_actions_bar.h and so
on to vector_icons_public.h, but I forward declared ToolbarActionsBar there, so
this became necessary.

 
 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
     : MediaRouterContextualMenu(
           browser,
           MediaRouterActionController::IsActionShownByPolicy(
               browser->profile())) {}
 
 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser,
                                                      bool shown_by_policy)
     : browser_(browser), menu_model_(this) {
@@ skipping 119 matching lines @@
           media_router::MediaRouterFactory::GetApiForBrowserContext(
               static_cast<content::BrowserContext*>(browser_->profile())));
   if (media_router->media_route_provider_extension_id().empty())
     return;
   std::string feedback_url(extensions::kExtensionScheme +
                            std::string(url::kStandardSchemeSeparator) +
                            media_router->media_route_provider_extension_id() +
                            "/feedback.html");
   chrome::ShowSingletonTab(browser_, GURL(feedback_url));
 }