views: register ShellCrApplication in views content clients

Not doing this causes a DCHECK failure at startup (issue 917698) but also causes the Chrome message loop not to interoperate properly with the native message loop. Bug: 917698 Change-Id: Ife2e789a2eb8679bc32bc5b8349fef1dbebb0c80 Reviewed-on: https://chromium-review.googlesource.com/c/1432652 Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org> Auto-Submit: Elly Fong-Jones <ellyjones@chromium.org> Reviewed-by: Trent Apted <tapted@chromium.org> Cr-Commit-Position: refs/heads/master@{#625709}
Denger-Network · Jan 24, 2019 · 3ebef67 · 3ebef67
1 parent cf92464
commit 3ebef67
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 0 deletions.
diff --git a/ui/views_content_client/views_content_client_main_parts.cc b/ui/views_content_client/views_content_client_main_parts.cc
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include "base/run_loop.h"
+#include "build/build_config.h"
 #include "content/public/browser/context_factory.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "ui/base/ime/input_method_initializer.h"
@@ -25,6 +26,10 @@ ViewsContentClientMainParts::ViewsContentClientMainParts(
 ViewsContentClientMainParts::~ViewsContentClientMainParts() {
 }
 
+#if !defined(OS_MACOSX)
+void ViewsContentClientMainParts::PreCreateMainMessageLoop() {}
+#endif
+
 void ViewsContentClientMainParts::PreMainMessageLoopRun() {
   ui::MaterialDesignController::Initialize();
   ui::InitializeInputMethodForTesting();

diff --git a/ui/views_content_client/views_content_client_main_parts.h b/ui/views_content_client/views_content_client_main_parts.h
@@ -34,6 +34,9 @@ class ViewsContentClientMainParts : public content::BrowserMainParts {
       const content::MainFunctionParams& content_params,
       ViewsContentClient* views_content_client);
 
+  // Invoked before the BrowserMainLoop constructor.
+  static void PreCreateMainMessageLoop();
+
   ~ViewsContentClientMainParts() override;
 
   // content::BrowserMainParts:

diff --git a/ui/views_content_client/views_content_client_main_parts_mac.mm b/ui/views_content_client/views_content_client_main_parts_mac.mm
@@ -10,6 +10,7 @@
 #include "base/path_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_paths.h"
+#include "content/shell/browser/shell_application_mac.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "ui/views_content_client/views_content_client.h"
 #include "ui/views_content_client/views_content_client_main_parts.h"
@@ -84,6 +85,15 @@ - (void)setTask:(const base::Closure&)task;
       new ViewsContentClientMainPartsMac(content_params, views_content_client);
 }
 
+// static
+void ViewsContentClientMainParts::PreCreateMainMessageLoop() {
+  // Simply instantiating an instance of ShellCrApplication serves to register
+  // it as the application class. Do make sure that no other code has done this
+  // first, though.
+  CHECK_EQ(NSApp, nil);
+  [ShellCrApplication sharedApplication];
+}
+
 }  // namespace ui
 
 @implementation ViewsContentClientAppController
@@ -114,6 +124,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
               keyEquivalent:@"q"];
   [appMenuItem setSubmenu:appMenu];
 
+  CHECK([NSApp isKindOfClass:[ShellCrApplication class]]);
+
   task_.Run();
 }
 

diff --git a/ui/views_content_client/views_content_main_delegate.cc b/ui/views_content_client/views_content_main_delegate.cc
@@ -15,6 +15,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/views_content_client/views_content_browser_client.h"
+#include "ui/views_content_client/views_content_client_main_parts.h"
 
 #if defined(OS_WIN)
 #include "base/logging_win.h"
@@ -79,6 +80,11 @@ void ViewsContentMainDelegate::PreSandboxStartup() {
   }
 }
 
+void ViewsContentMainDelegate::PreCreateMainMessageLoop() {
+  content::ContentMainDelegate::PreCreateMainMessageLoop();
+  ViewsContentClientMainParts::PreCreateMainMessageLoop();
+}
+
 content::ContentBrowserClient*
     ViewsContentMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new ViewsContentBrowserClient(views_content_client_));

diff --git a/ui/views_content_client/views_content_main_delegate.h b/ui/views_content_client/views_content_main_delegate.h
@@ -24,6 +24,7 @@ class ViewsContentMainDelegate : public content::ContentMainDelegate {
   // content::ContentMainDelegate implementation
   bool BasicStartupComplete(int* exit_code) override;
   void PreSandboxStartup() override;
+  void PreCreateMainMessageLoop() override;
   content::ContentBrowserClient* CreateContentBrowserClient() override;
 
  private: