Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2797)

Unified Diff: chrome/browser/interstitials/chrome_controller_client.cc

Issue 1481213003: Componentize the bad clock blocking page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change for pkasting Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/interstitials/chrome_controller_client.cc
diff --git a/chrome/browser/interstitials/chrome_controller_client.cc b/chrome/browser/interstitials/chrome_controller_client.cc
index 01c1be72a86d3e965b9ec9ff26b8a847c440de42..c39e2a5476359c35794ff3db1dcd8e219db99050 100644
--- a/chrome/browser/interstitials/chrome_controller_client.cc
+++ b/chrome/browser/interstitials/chrome_controller_client.cc
@@ -4,21 +4,162 @@
#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/prefs/pref_service.h"
+#include "base/process/launch.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/referrer.h"
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/intent_helper.h"
+#endif
+
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/chrome_pages.h"
+#include "chrome/common/url_constants.h"
+#include "chrome/grit/generated_resources.h"
+#include "ui/base/l10n/l10n_util.h"
+#endif
+
+#if defined(OS_WIN)
+#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() {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
+// The code for each OS is completely separate, in order to avoid bugs like
+// https://crbug.com/430877 .
+#if defined(OS_ANDROID)
+ chrome::android::OpenDateAndTimeSettings();
+
+#elif defined(OS_CHROMEOS)
+ std::string sub_page =
+ std::string(chrome::kSearchSubPage) + "#" +
+ l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME);
+ chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
+ sub_page);
+
+#elif defined(OS_IOS)
+ // TODO(blundell): Remove this once iOS has its own version of this class.
+ // iOS does not have a way to launch the date and time settings.
+ NOTREACHED();
+
+#elif defined(OS_LINUX)
+ struct ClockCommand {
+ const char* pathname;
+ const char* 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"},
+ {"/opt/bin/gnome-control-center", "datetime"},
+ // KDE
+ {"/usr/bin/kcmshell4", "clock"},
+ {"/usr/local/bin/kcmshell4", "clock"},
+ {"/opt/bin/kcmshell4", "clock"},
+ };
+
+ base::CommandLine command(base::FilePath(""));
+ for (const ClockCommand& cmd : kClockCommands) {
+ base::FilePath pathname(cmd.pathname);
+ if (base::PathExists(pathname)) {
+ command.SetProgram(pathname);
+ command.AppendArg(cmd.argument);
+ break;
+ }
+ }
+ if (command.GetProgram().empty()) {
+ // Alas, there is nothing we can do.
+ return;
+ }
+
+ base::LaunchOptions options;
+ options.wait = false;
+ options.allow_new_privs = true;
+ base::LaunchProcess(command, options);
+
+#elif defined(OS_MACOSX)
+ base::CommandLine command(base::FilePath("/usr/bin/open"));
+ command.AppendArg("/System/Library/PreferencePanes/DateAndTime.prefPane");
+
+ base::LaunchOptions options;
+ options.wait = false;
+ base::LaunchProcess(command, options);
+
+#elif defined(OS_WIN)
+ base::FilePath path;
+ PathService::Get(base::DIR_SYSTEM, &path);
+ static const base::char16 kControlPanelExe[] = L"control.exe";
+ path = path.Append(base::string16(kControlPanelExe));
+ base::CommandLine command(path);
+ command.AppendArg(std::string("/name"));
+ command.AppendArg(std::string("Microsoft.DateAndTime"));
+
+ 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.)
+}
+
+} // namespace
+
ChromeControllerClient::ChromeControllerClient(
content::WebContents* web_contents)
- : web_contents_(web_contents) {}
+ : 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() {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::FILE, FROM_HERE,
+ base::Bind(&LaunchDateAndTimeSettingsOnFile));
+}
+
+void ChromeControllerClient::GoBack() {
+ DCHECK(interstitial_page_);
+ interstitial_page_->DontProceed();
+}
+
void ChromeControllerClient::OpenUrlInCurrentTab(const GURL& url) {
content::OpenURLParams params(url, Referrer(), CURRENT_TAB,
ui::PAGE_TRANSITION_LINK, false);
« no previous file with comments | « chrome/browser/interstitials/chrome_controller_client.h ('k') | chrome/browser/interstitials/security_interstitial_page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698