chrome/mash: Load resources before running the mus app.

chrome/app/mash/mash_runner.cc

 // Copyright 2016 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/app/mash/mash_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 11 matching lines @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/native_runner_delegate.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/interfaces/service_factory.mojom.h"
 #include "services/shell/runner/common/switches.h"
 #include "services/shell/runner/host/child_process_base.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
+#include "ui/base/ui_base_switches.h"
 
 using shell::mojom::ServiceFactory;
 
 namespace {
 
 // kProcessType used to identify child processes.
 const char* kMashChild = "mash-child";
 
 bool IsChild() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kProcessType) &&
          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
              switches::kProcessType) == kMashChild;
 }
 
+void InitializeResources() {
+  ui::RegisterPathProvider();
+  const std::string locale =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kLang);
+  ui::ResourceBundle::InitSharedInstanceWithLocale(

[msw, 2016/10/03 22:07:39]

nit: add a comment that this loads Chrome's resource paks.

[sadrul, 2016/10/04 00:42:48]

Done.

+      locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);

[sky, 2016/10/03 22:17:17]

nullptr

[sadrul, 2016/10/04 00:42:48]

Done.

+}
+
 // Convert the command line program from chrome_mash to chrome. This is
 // necessary as the shell will attempt to start chrome_mash. We want chrome.
 void ChangeChromeMashToChrome(base::CommandLine* command_line) {
   base::FilePath exe_path(command_line->GetProgram());
 #if defined(OS_WIN)
   exe_path = exe_path.DirName().Append(FILE_PATH_LITERAL("chrome.exe"));
 #else
   exe_path = exe_path.DirName().Append(FILE_PATH_LITERAL("chrome"));
 #endif
   command_line->SetProgram(exe_path);
@@ skipping 56 matching lines @@
   service_.reset(new mash::MashPackagedService);
   service_->set_context(base::MakeUnique<shell::ServiceContext>(
       service_.get(),
       background_shell.CreateServiceRequest("exe:chrome_mash")));
   service_->connector()->Connect("mojo:mash_session");
   base::RunLoop().Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
+  InitializeResources();
   shell::ChildProcessMainWithCallback(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
 
 void MashRunner::StartChildApp(
     shell::mojom::ServiceRequest service_request) {
   // TODO(sad): Normally, this would be a TYPE_DEFAULT message loop. However,
   // TYPE_UI is needed for mojo:ui. But it is not known whether the child app is
   // going to be mojo:ui at this point. So always create a TYPE_UI message loop
   // for now.
@@ skipping 31 matching lines @@
         tracing::GetConfigForTraceToConsole();
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         trace_config,
         base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }