diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 22:20:52 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 22:20:52 +0000 |
| commit | dcc2977772bdd296d8bfbcaedafd4441def78e3d (patch) | |
| tree | cb0bdc148cff3f5a221b89ad2c055212d58bb976 /chrome/service | |
| parent | 404d9a54ceae52b741b3e173af12fb7fd21c8548 (diff) | |
| download | chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.zip chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.tar.gz chromium_src-dcc2977772bdd296d8bfbcaedafd4441def78e3d.tar.bz2 | |
Delete the GTK+ port of Chrome.
BUG=297026
R=ben@chromium.org
Review URL: https://codereview.chromium.org/231733005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/service_process.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 5d42852..5b02bc2 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -39,11 +39,6 @@ #include <glib-object.h> #endif -#if defined(TOOLKIT_GTK) -#include <gtk/gtk.h> -#include "ui/gfx/gtk_util.h" -#endif - ServiceProcess* g_service_process = NULL; namespace { @@ -130,21 +125,7 @@ ServiceProcess::ServiceProcess() bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop, const CommandLine& command_line, ServiceProcessState* state) { -#if defined(TOOLKIT_GTK) - // TODO(jamiewalch): Calling GtkInitFromCommandLine here causes the process - // to abort if run headless. The correct fix for this is to refactor the - // service process to be more modular, a task that is currently underway. - // However, since this problem is blocking cloud print, the following quick - // hack will have to do. Note that the situation with this hack in place is - // no worse than it was when we weren't initializing GTK at all. - int argc = 1; - scoped_ptr<char*[]> argv(new char*[2]); - argv[0] = strdup(command_line.argv()[0].c_str()); - argv[1] = NULL; - char **argv_pointer = argv.get(); - gtk_init_check(&argc, &argv_pointer); - free(argv[0]); -#elif defined(USE_GLIB) +#if defined(USE_GLIB) // g_type_init has been deprecated since version 2.35. #if !GLIB_CHECK_VERSION(2, 35, 0) // GLib type system initialization is needed for gconf. |