Open ChromeOS clock settings on the UI thread instead of File.

chrome/browser/interstitials/chrome_controller_client.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 "chrome/browser/interstitials/chrome_controller_client.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/process/launch.h"
@@ skipping 23 matching lines @@
 #include "base/base_paths_win.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/win/windows_version.h"
 #endif
 
 using content::Referrer;
 
 namespace {
 
-void LaunchDateAndTimeSettingsOnFile() {
+#if !defined(OS_CHROMEOS)
+void LaunchDateAndTimeSettingsOnFileThread() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 // The code for each OS is completely separate, in order to avoid bugs like
-// https://crbug.com/430877 .
+// https://crbug.com/430877 . ChromeOS is handled on the UI thread.
 #if defined(OS_ANDROID)
   chrome::android::OpenDateAndTimeSettings();
 
-#elif defined(OS_CHROMEOS)
-  chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
-                                        chrome::kDateTimeSubPage);
-
 #elif defined(OS_LINUX)
   struct ClockCommand {
-    const char* pathname;
-    const char* argument;
+    const char* const pathname;
+    const char* const argument;
   };
   static const ClockCommand kClockCommands[] = {
       // Unity
       {"/usr/bin/unity-control-center", "datetime"},
       // GNOME
       //
       // NOTE: On old Ubuntu, naming control panels doesn't work, so it
       // opens the overview. This will have to be good enough.
       {"/usr/bin/gnome-control-center", "datetime"},
       {"/usr/local/bin/gnome-control-center", "datetime"},
@@ skipping 43 matching lines @@
   base::LaunchOptions options;
   options.wait = false;
   base::LaunchProcess(command, options);
 
 #else
   NOTREACHED();
 
 #endif
   // Don't add code here! (See the comment at the beginning of the function.)
 }
+#endif
 
 }  // namespace
 
 ChromeControllerClient::ChromeControllerClient(
     content::WebContents* web_contents,
     std::unique_ptr<security_interstitials::MetricsHelper> metrics_helper)
     : ControllerClient(std::move(metrics_helper)),
       web_contents_(web_contents),
       interstitial_page_(nullptr) {}
 
 ChromeControllerClient::~ChromeControllerClient() {}
 
 void ChromeControllerClient::set_interstitial_page(
     content::InterstitialPage* interstitial_page) {
   interstitial_page_ = interstitial_page;
 }
 
 bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
     defined(OS_MACOSX) || defined(OS_WIN)
   return true;
 #else
   return false;
 #endif
 }
 
 void ChromeControllerClient::LaunchDateAndTimeSettings() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+#if defined(OS_CHROMEOS)
+  chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
+                                        chrome::kDateTimeSubPage);
+#else
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&LaunchDateAndTimeSettingsOnFile));
+      base::Bind(&LaunchDateAndTimeSettingsOnFileThread));
+#endif
 }
 
 void ChromeControllerClient::GoBack() {
   interstitial_page_->DontProceed();
 }
 
 void ChromeControllerClient::Proceed() {
   interstitial_page_->Proceed();
 }
 
@@ skipping 14 matching lines @@
 
 PrefService* ChromeControllerClient::GetPrefService() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return profile->GetPrefs();
 }
 
 const std::string ChromeControllerClient::GetExtendedReportingPrefName() {
   return safe_browsing::GetExtendedReportingPrefName(*GetPrefService());
 }