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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 7835021: Linux: use our spiffy new DBus client library for KWallet, instead of dbus-glib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 // check is actually equivalent and sufficient to work around the 600 // check is actually equivalent and sufficient to work around the
601 // error. 601 // error.
602 if (!g_thread_supported()) 602 if (!g_thread_supported())
603 g_thread_init(NULL); 603 g_thread_init(NULL);
604 // Glib type system initialization. Needed at least for gconf, 604 // Glib type system initialization. Needed at least for gconf,
605 // used in net/proxy/proxy_config_service_linux.cc. Most likely 605 // used in net/proxy/proxy_config_service_linux.cc. Most likely
606 // this is superfluous as gtk_init() ought to do this. It's 606 // this is superfluous as gtk_init() ought to do this. It's
607 // definitely harmless, so retained as a reminder of this 607 // definitely harmless, so retained as a reminder of this
608 // requirement for gconf. 608 // requirement for gconf.
609 g_type_init(); 609 g_type_init();
610 // We use glib-dbus for geolocation and it's possible other libraries 610 // We use glib-dbus for geolocation and it's possible other libraries
satorux1 2011/09/06 20:42:40 Could you update the comment? geolocation has swit
Mike Mammarella 2011/09/07 01:01:27 Done.
611 // (e.g. gnome-keyring) will use it, so initialize its threading here 611 // (e.g. kwallet) will use it, so initialize its threading here as well.
612 // as well. 612 // TODO(satorux): remove this once all dbus-glib clients are gone.
613 dbus_g_thread_init(); 613 dbus_g_thread_init();
614 gfx::GtkInitFromCommandLine(parameters.command_line_); 614 gfx::GtkInitFromCommandLine(parameters.command_line_);
615 SetUpGLibLogHandler(); 615 SetUpGLibLogHandler();
616 #endif 616 #endif
617 617
618 #if defined(TOOLKIT_GTK) 618 #if defined(TOOLKIT_GTK)
619 // It is important for this to happen before the first run dialog, as it 619 // It is important for this to happen before the first run dialog, as it
620 // styles the dialog as well. 620 // styles the dialog as well.
621 gtk_util::InitRCStyles(); 621 gtk_util::InitRCStyles();
622 #endif 622 #endif
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after
2216 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2216 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2217 (pre_read == "0" || pre_read == "1")) { 2217 (pre_read == "0" || pre_read == "1")) {
2218 std::string uma_name(name); 2218 std::string uma_name(name);
2219 uma_name += "_PreRead"; 2219 uma_name += "_PreRead";
2220 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2220 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2221 AddPreReadHistogramTime(uma_name.c_str(), time); 2221 AddPreReadHistogramTime(uma_name.c_str(), time);
2222 } 2222 }
2223 #endif 2223 #endif
2224 #endif 2224 #endif
2225 } 2225 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698