Make //blimp/client/app a real embedder of //blimp/client/public

blimp/client/app/linux/blimp_main.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 <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/app/blimp_startup.h"
 #include "blimp/client/app/linux/blimp_client_context_delegate_linux.h"
 #include "blimp/client/app/linux/blimp_display_manager.h"
 #include "blimp/client/app/linux/blimp_display_manager_delegate_main.h"
-#include "blimp/client/core/settings/settings_prefs.h"
-#include "blimp/client/core/switches/blimp_client_switches.h"
 #include "blimp/client/public/blimp_client_context.h"
 #include "blimp/client/public/contents/blimp_navigation_controller.h"
 #include "blimp/client/support/compositor/compositor_dependencies_impl.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/command_line_pref_store.h"
 #include "components/prefs/in_memory_pref_store.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
 #include "skia/ext/fontmgr_default_linux.h"
 #include "third_party/skia/include/ports/SkFontConfigInterface.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkFontMgr_android.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/x/x11_connection.h"
 
 namespace {
+// Specifies directory where android fonts are stored.
+const char kAndroidFontsPath[] = "android-fonts-path";
 const char kDefaultUrl[] = "https://www.google.com";
 constexpr int kWindowWidth = 800;
 constexpr int kWindowHeight = 600;
 
 class BlimpShellCommandLinePrefStore : public CommandLinePrefStore {
  public:
   explicit BlimpShellCommandLinePrefStore(const base::CommandLine* command_line)
       : CommandLinePrefStore(command_line) {
     blimp::client::BlimpClientContext::ApplyBlimpSwitches(this);
   }
 
  protected:
   ~BlimpShellCommandLinePrefStore() override = default;
 };
 
 bool HasAndroidFontSwitch() {
-  return base::CommandLine::ForCurrentProcess()->HasSwitch(
-      blimp::switches::kAndroidFontsPath);
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(kAndroidFontsPath);
 }
 
 std::string GetAndroidFontsDirectory() {
   std::string android_fonts_dir =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          blimp::switches::kAndroidFontsPath);
+          kAndroidFontsPath);
   if (android_fonts_dir.size() > 0 && android_fonts_dir.back() != '/') {
     android_fonts_dir += '/';
   }
   return android_fonts_dir;
 }
 
 SkFontMgr* CreateAndroidFontMgr(std::string android_fonts_dir) {
   SkFontMgr_Android_CustomFonts custom;
   custom.fSystemFontUse =
       SkFontMgr_Android_CustomFonts::SystemFontUse::kOnlyCustom;
@@ skipping 13 matching lines @@
   custom.fIsolated = true;
 
   return SkFontMgr_New_Android(&custom);
 }
 
 void SetupAndroidFontManager() {
   if (HasAndroidFontSwitch()) {
     SetDefaultSkiaFactory(CreateAndroidFontMgr(GetAndroidFontsDirectory()));
   }
 }
+
+void InitializeResourceBundle() {
+  base::FilePath pak_file;
+  bool pak_file_valid = base::PathService::Get(base::DIR_MODULE, &pak_file);
+  CHECK(pak_file_valid);
+  pak_file = pak_file.Append(FILE_PATH_LITERAL("blimp_shell.pak"));
+  ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
+}
+
 }  // namespace
 
 int main(int argc, const char**argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
   SetupAndroidFontManager();
 
   CHECK(gfx::InitializeThreadedX11());
 
   blimp::client::InitializeLogging();
   blimp::client::InitializeMainMessageLoop();
-  blimp::client::InitializeResourceBundle();
+  InitializeResourceBundle();
 
   base::Thread io_thread("BlimpIOThread");
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   io_thread.StartWithOptions(options);
 
   // Creating this using "new" and passing to context using "WrapUnique" as
   // opposed to "MakeUnique" because we'll need to pass the compositor
   // dependencies to the display manager as well.
   blimp::client::CompositorDependencies* compositor_dependencies =
@@ skipping 40 matching lines @@
   std::unique_ptr<blimp::client::BlimpDisplayManagerDelegate>
       display_manager_delegate =
           base::MakeUnique<blimp::client::BlimpDisplayManagerDelegateMain>();
   blimp::client::BlimpDisplayManager display_manager(
       display_manager_delegate.get(), compositor_dependencies);
   display_manager.SetWindowSize(gfx::Size(kWindowWidth, kWindowHeight));
   display_manager.SetBlimpContents(std::move(contents));
 
   base::RunLoop().Run();
 }