Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/component_toolbar_actions_factory.cc

 // Copyright 2014 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/component_toolbar_actions_factory.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
 #include "chrome/common/chrome_switches.h"
 #include "extensions/common/feature_switch.h"
 
 namespace {
 
 ComponentToolbarActionsFactory* testing_factory_ = nullptr;
 
 base::LazyInstance<ComponentToolbarActionsFactory> lazy_factory =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
+// static
+const char ComponentToolbarActionsFactory::kMediaRouterActionId[] =
+    "media_router_action";
+const char ComponentToolbarActionsFactory::kActionIdForTest[] = "mock_action";
+
 ComponentToolbarActionsFactory::ComponentToolbarActionsFactory()
     : num_component_actions_(-1) {}
 ComponentToolbarActionsFactory::~ComponentToolbarActionsFactory() {}
 
 // static
 ComponentToolbarActionsFactory* ComponentToolbarActionsFactory::GetInstance() {
   return testing_factory_ ? testing_factory_ : &lazy_factory.Get();
 }
 
+// static
+std::vector<std::string>* ComponentToolbarActionsFactory::GetComponentIds() {

[mark a. foltz, 2015/08/05 20:21:53]

IMO it would be better to return a scoped_ptr<> here and return with .Pass() so
that the caller knows that it has explicit ownership of the return value.

[apacible, 2015/08/05 23:21:43]

Switched to just returning std::vector<std::string>.

+  std::vector<std::string>* component_ids = new std::vector<std::string>;
+
+  if (testing_factory_) {
+    component_ids->push_back(ComponentToolbarActionsFactory::kActionIdForTest);
+  } else {
+#if defined(ENABLE_MEDIA_ROUTER)
+    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+            ::switches::kEnableMediaRouter)) {
+      component_ids->push_back(
+          ComponentToolbarActionsFactory::kMediaRouterActionId);
+    }
+#endif  // ENABLE_MEDIA_ROUTER
+  }
+
+  return component_ids;
+}
+
 ScopedVector<ToolbarActionViewController>
 ComponentToolbarActionsFactory::GetComponentToolbarActions(Browser* browser) {
   ScopedVector<ToolbarActionViewController> component_actions;
 
   // This is currently behind the extension-action-redesign flag, as it is
   // designed for the new toolbar.
   if (!extensions::FeatureSwitch::extension_action_redesign()->IsEnabled())
     return component_actions.Pass();
 
   // Add component toolbar actions here.
@@ skipping 18 matching lines @@
     num_component_actions_ = GetComponentToolbarActions(browser).size();
 
   return num_component_actions_;
 }
 
 // static
 void ComponentToolbarActionsFactory::SetTestingFactory(
     ComponentToolbarActionsFactory* factory) {
   testing_factory_ = factory;
 }