Remove GTK deps on chrome, content, and prefs

BUG=None
R=sky

Change-Id: I46c44a85089ed1f2dd226c1e3df00991fad95864
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2097463
Commit-Queue: Scott Violet <sky@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751341}

chrome/browser/themes/theme_service_aura_linux.cc

@@ -62,7 +62,9 @@ bool SystemThemeX11::GetTint(int id, color_utils::HSL* hsl) const {
 }
 
 bool SystemThemeX11::GetColor(int id, SkColor* color) const {
-  return linux_ui_ && linux_ui_->GetColor(id, color, pref_service_);
+  return linux_ui_ && linux_ui_->GetColor(id, color,
+                                          pref_service_->GetBoolean(
+                                              prefs::kUseCustomChromeFrame));
 }
 
 bool SystemThemeX11::GetDisplayProperty(int id, int* result) const {

chrome/browser/ui/gtk/BUILD.gn

@@ -58,9 +58,6 @@ jumbo_component("gtk") {
     "//base",
     "//build/config/linux/gtk",
     "//build/config/linux/gtk:gtkprint",
-    "//chrome/common:constants",
-    "//components/prefs",
-    "//content/public/browser",
     "//printing",
     "//skia",
 

chrome/browser/ui/gtk/gtk_key_bindings_handler.cc

@@ -13,7 +13,6 @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/base/ime/text_edit_commands.h"
 #include "ui/events/event.h"
 

chrome/browser/ui/gtk/gtk_ui.cc

@@ -32,8 +32,6 @@
 #include "chrome/browser/ui/gtk/printing_gtk_util.h"
 #include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
 #include "chrome/browser/ui/gtk/settings_provider_gtk.h"
-#include "chrome/common/pref_names.h"
-#include "components/prefs/pref_service.h"
 #include "printing/buildflags/buildflags.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ -491,11 +489,10 @@ bool GtkUi::GetTint(int id, color_utils::HSL* tint) const {
   return false;
 }
 
-bool GtkUi::GetColor(int id, SkColor* color, PrefService* pref_service) const {
+bool GtkUi::GetColor(int id, SkColor* color, bool use_custom_frame) const {
   for (const ColorMap& color_map :
-       {colors_, pref_service->GetBoolean(prefs::kUseCustomChromeFrame)
-                     ? custom_frame_colors_
-                     : native_frame_colors_}) {
+       {colors_,
+        use_custom_frame ? custom_frame_colors_ : native_frame_colors_}) {
     auto it = color_map.find(id);
     if (it != color_map.end()) {
       *color = it->second;

chrome/browser/ui/gtk/gtk_ui.h

@@ -68,9 +68,7 @@ class GtkUi : public views::LinuxUI {
   // views::LinuxUI:
   void Initialize() override;
   bool GetTint(int id, color_utils::HSL* tint) const override;
-  bool GetColor(int id,
-                SkColor* color,
-                PrefService* pref_service) const override;
+  bool GetColor(int id, SkColor* color, bool use_custom_frame) const override;
   bool GetDisplayProperty(int id, int* result) const override;
   SkColor GetFocusRingColor() const override;
   SkColor GetActiveSelectionBgColor() const override;

chrome/browser/ui/gtk/print_dialog_gtk.cc

@@ -18,13 +18,14 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/no_destructor.h"
+#include "base/sequence_checker.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "base/task/thread_pool.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/printing_gtk_util.h"
-#include "content/public/browser/browser_task_traits.h"
 #include "printing/metafile.h"
 #include "printing/print_job_constants.h"
 #include "printing/print_settings.h"
@@ -34,7 +35,6 @@
 #include "ui/events/platform/x11/x11_event_source.h"  // nogncheck
 #endif
 
-using content::BrowserThread;
 using printing::PageRanges;
 using printing::PrintSettings;
 
@@ -173,15 +173,16 @@ class GtkPrinterList {
 // static
 printing::PrintDialogGtkInterface* PrintDialogGtk::CreatePrintDialog(
     PrintingContextLinux* context) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return new PrintDialogGtk(context);
 }
 
 PrintDialogGtk::PrintDialogGtk(PrintingContextLinux* context)
-    : context_(context) {}
+    : base::RefCountedDeleteOnSequence<PrintDialogGtk>(
+          base::SequencedTaskRunnerHandle::Get()),
+      context_(context) {}
 
 PrintDialogGtk::~PrintDialogGtk() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (dialog_) {
     aura::Window* parent = gtk::GetAuraTransientParent(dialog_);
@@ -366,7 +367,7 @@ void PrintDialogGtk::ShowDialog(
 void PrintDialogGtk::PrintDocument(const printing::MetafilePlayer& metafile,
                                    const base::string16& document_name) {
   // This runs on the print worker thread, does not block the UI thread.
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // The document printing tasks can outlive the PrintingContext that created
   // this dialog.
@@ -392,8 +393,8 @@ void PrintDialogGtk::PrintDocument(const printing::MetafilePlayer& metafile,
   }
 
   // No errors, continue printing.
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&PrintDialogGtk::SendDocumentToPrinter, this,
+  base::SequencedTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(&PrintDialogGtk::SendDocumentToPrinter, this,
                                 document_name));
 }
 
@@ -490,7 +491,7 @@ static void OnJobCompletedThunk(GtkPrintJob* print_job,
 }
 void PrintDialogGtk::SendDocumentToPrinter(
     const base::string16& document_name) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   // If |printer_| is nullptr then somehow the GTK printer list changed out
   // under us. In which case, just bail out.

chrome/browser/ui/gtk/print_dialog_gtk.h

@@ -12,9 +12,8 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_delete_on_sequence.h"
 #include "base/sequenced_task_runner_helpers.h"
-#include "content/public/browser/browser_thread.h"
 #include "printing/print_dialog_gtk_interface.h"
 #include "printing/printing_context_linux.h"
 #include "ui/aura/window_observer.h"
@@ -29,9 +28,7 @@ using printing::PrintingContextLinux;
 
 // Needs to be freed on the UI thread to clean up its GTK members variables.
 class PrintDialogGtk : public printing::PrintDialogGtkInterface,
-                       public base::RefCountedThreadSafe<
-                           PrintDialogGtk,
-                           content::BrowserThread::DeleteOnUIThread>,
+                       public base::RefCountedDeleteOnSequence<PrintDialogGtk>,
                        public aura::WindowObserver {
  public:
   // Creates and returns a print dialog.
@@ -55,8 +52,7 @@ class PrintDialogGtk : public printing::PrintDialogGtkInterface,
   void OnJobCompleted(GtkPrintJob* print_job, const GError* error);
 
  private:
-  friend struct content::BrowserThread::DeleteOnThread<
-      content::BrowserThread::UI>;
+  friend class base::RefCountedDeleteOnSequence<PrintDialogGtk>;
   friend class base::DeleteHelper<PrintDialogGtk>;
 
   explicit PrintDialogGtk(PrintingContextLinux* context);
@@ -88,6 +84,8 @@ class PrintDialogGtk : public printing::PrintDialogGtkInterface,
 
   base::FilePath path_to_pdf_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(PrintDialogGtk);
 };
 

chrome/browser/ui/gtk/select_file_dialog_impl.cc

@@ -10,9 +10,6 @@
 #include "base/files/file_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/threading/thread_restrictions.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
 
 namespace {
 
@@ -31,7 +28,6 @@ base::FilePath* SelectFileDialogImpl::last_opened_path_ = nullptr;
 ui::SelectFileDialog* SelectFileDialogImpl::Create(
     ui::SelectFileDialog::Listener* listener,
     std::unique_ptr<ui::SelectFilePolicy> policy) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (use_kde_ == UNKNOWN) {
     // Start out assumimg we are not going to use KDE.
     use_kde_ = NO_KDE;

chrome/browser/ui/gtk/select_file_dialog_impl_kde.cc

@@ -26,14 +26,11 @@
 #include "base/task/thread_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/ui/gtk/select_file_dialog_impl.h"
-#include "content/public/browser/browser_thread.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/x/x11.h"
 #include "ui/strings/grit/ui_strings.h"
 
-using content::BrowserThread;
-
 namespace {
 
 std::string GetTitle(const std::string& title, int message_id) {
@@ -180,6 +177,8 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
   // A task runner for blocking pipe reads.
   scoped_refptr<base::SequencedTaskRunner> pipe_task_runner_;
 
+  SEQUENCE_CHECKER(sequence_checker_);
+
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImplKDE);
 };
 
@@ -222,7 +221,7 @@ SelectFileDialogImplKDE::SelectFileDialogImplKDE(
 SelectFileDialogImplKDE::~SelectFileDialogImplKDE() {}
 
 bool SelectFileDialogImplKDE::IsRunning(gfx::NativeWindow parent_window) const {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   if (parent_window && parent_window->GetHost()) {
     XID xid = parent_window->GetHost()->GetAcceleratedWidget();
     return parents_.find(xid) != parents_.end();
@@ -241,7 +240,7 @@ void SelectFileDialogImplKDE::SelectFileImpl(
     const base::FilePath::StringType& default_extension,
     gfx::NativeWindow owning_window,
     void* params) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   type_ = type;
 
   XID window_xid = x11::None;
@@ -410,8 +409,8 @@ void SelectFileDialogImplKDE::CreateSelectFolderDialog(
   int title_message_id = (type == SELECT_UPLOAD_FOLDER)
                              ? IDS_SELECT_UPLOAD_FOLDER_DIALOG_TITLE
                              : IDS_SELECT_FOLDER_DIALOG_TITLE;
-  base::PostTaskAndReplyWithResult(
-      pipe_task_runner_.get(), FROM_HERE,
+  pipe_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
       base::BindOnce(
           &SelectFileDialogImplKDE::CallKDialogOutput, this,
           KDialogParams(
@@ -428,8 +427,8 @@ void SelectFileDialogImplKDE::CreateFileOpenDialog(
     const base::FilePath& default_path,
     XID parent,
     void* params) {
-  base::PostTaskAndReplyWithResult(
-      pipe_task_runner_.get(), FROM_HERE,
+  pipe_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
       base::BindOnce(
           &SelectFileDialogImplKDE::CallKDialogOutput, this,
           KDialogParams(
@@ -445,8 +444,8 @@ void SelectFileDialogImplKDE::CreateMultiFileOpenDialog(
     const base::FilePath& default_path,
     XID parent,
     void* params) {
-  base::PostTaskAndReplyWithResult(
-      pipe_task_runner_.get(), FROM_HERE,
+  pipe_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
       base::BindOnce(
           &SelectFileDialogImplKDE::CallKDialogOutput, this,
           KDialogParams(
@@ -462,8 +461,8 @@ void SelectFileDialogImplKDE::CreateSaveAsDialog(
     const base::FilePath& default_path,
     XID parent,
     void* params) {
-  base::PostTaskAndReplyWithResult(
-      pipe_task_runner_.get(), FROM_HERE,
+  pipe_task_runner_->PostTaskAndReplyWithResult(
+      FROM_HERE,
       base::BindOnce(
           &SelectFileDialogImplKDE::CallKDialogOutput, this,
           KDialogParams("--getsavefilename",
@@ -500,7 +499,7 @@ void SelectFileDialogImplKDE::OnSelectSingleFileDialogResponse(
     XID parent,
     void* params,
     std::unique_ptr<KDialogOutputParams> results) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   parents_.erase(parent);
   SelectSingleFileHelper(params, false, std::move(results));
 }
@@ -509,7 +508,7 @@ void SelectFileDialogImplKDE::OnSelectSingleFolderDialogResponse(
     XID parent,
     void* params,
     std::unique_ptr<KDialogOutputParams> results) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   parents_.erase(parent);
   SelectSingleFileHelper(params, true, std::move(results));
 }
@@ -518,7 +517,7 @@ void SelectFileDialogImplKDE::OnSelectMultiFileDialogResponse(
     XID parent,
     void* params,
     std::unique_ptr<KDialogOutputParams> results) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   VLOG(1) << "[kdialog] MultiFileResponse: " << results->output;
 
   parents_.erase(parent);

ui/views/linux_ui/linux_ui.h

@@ -25,8 +25,6 @@
 // The main entrypoint into Linux toolkit specific code. GTK code should only
 // be executed behind this interface.
 
-class PrefService;
-
 namespace aura {
 class Window;
 }
@@ -96,7 +94,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
   virtual bool GetTint(int id, color_utils::HSL* tint) const = 0;
   virtual bool GetColor(int id,
                         SkColor* color,
-                        PrefService* pref_service) const = 0;
+                        bool use_custom_frame) const = 0;
   virtual bool GetDisplayProperty(int id, int* result) const = 0;
 
   // Returns the preferences that we pass to Blink.