Mash: Replaces "exe:chrome" with "service:content_browser"

mash/app_driver/app_driver.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 "mash/app_driver/app_driver.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/event_matcher_util.h"
 
 using mash::mojom::LaunchablePtr;
 using mash::mojom::LaunchMode;
 
 namespace mash {
 namespace app_driver {
 namespace {
 
+const char kBrowserServiceName[] = "service:content_browser";
+
 enum class Accelerator : uint32_t {
   NewChromeWindow,
   NewChromeTab,
   NewChromeIncognitoWindow,
   ShowTaskManager,
 };
 
 struct AcceleratorSpec {
   Accelerator id;
   ui::mojom::KeyboardCode keyboard_code;
@@ skipping 69 matching lines @@
 
 void AppDriver::OnAccelerator(uint32_t id, std::unique_ptr<ui::Event> event) {
   struct LaunchOptions {
     uint32_t option;
     const char* app;
     LaunchMode mode;
   };
 
   std::map<Accelerator, LaunchOptions> options{
       {Accelerator::NewChromeWindow,
-       {mojom::kWindow, "exe:chrome", LaunchMode::MAKE_NEW}},
+       {mojom::kWindow, kBrowserServiceName, LaunchMode::MAKE_NEW}},
       {Accelerator::NewChromeTab,
-       {mojom::kDocument, "exe:chrome", LaunchMode::MAKE_NEW}},
+       {mojom::kDocument, kBrowserServiceName, LaunchMode::MAKE_NEW}},
       {Accelerator::NewChromeIncognitoWindow,
-       {mojom::kIncognitoWindow, "exe:chrome", LaunchMode::MAKE_NEW}},
+       {mojom::kIncognitoWindow, kBrowserServiceName, LaunchMode::MAKE_NEW}},
       {Accelerator::ShowTaskManager,
        {mojom::kWindow, "service:task_viewer", LaunchMode::DEFAULT}},
   };
 
   const auto iter = options.find(static_cast<Accelerator>(id));
   DCHECK(iter != options.end());
   const LaunchOptions& entry = iter->second;
   LaunchablePtr launchable;
   connector()->ConnectToInterface(entry.app, &launchable);
   launchable->Launch(entry.option, entry.mode);
 }
 
 void AppDriver::AddAccelerators() {
   connector()->ConnectToInterface("service:catalog", &catalog_);
   catalog_->GetEntriesProvidingClass(
       "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries,
                                        weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace app_driver
 }  // namespace mash