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

Unified Diff: net/proxy/proxy_config_service_linux.cc

Issue 5915004: Introduce incognito preference settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: net/proxy/proxy_config_service_linux.cc
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index 3867df103d3052ec09090e308ebf2e0ba3b62df9..ab092d5fc5ded6391c54a2b1d1cc89ca55cefef9 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -26,6 +26,7 @@
#include "base/string_tokenizer.h"
#include "base/string_util.h"
#include "base/task.h"
+#include "base/threading/thread_restrictions.h"
#include "base/timer.h"
#include "base/nix/xdg_util.h"
#include "googleurl/src/url_canon.h"
@@ -435,6 +436,9 @@ class GConfSettingGetterImplKDE
: inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
auto_no_pac_(false), reversed_bypass_list_(false),
env_var_getter_(env_var_getter), file_loop_(NULL) {
+ // TODO(mdm): This is called in UI thread (bug 69057).
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+
// Derive the location of the kde config dir from the environment.
std::string home;
if (env_var_getter->GetVar("KDEHOME", &home) && !home.empty()) {
@@ -502,6 +506,8 @@ class GConfSettingGetterImplKDE
virtual bool Init(MessageLoop* glib_default_loop,
MessageLoopForIO* file_loop) {
+ // TODO(mdm): This is called in UI thread (bug 69057).
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
DCHECK(inotify_fd_ < 0);
inotify_fd_ = inotify_init();
if (inotify_fd_ < 0) {
@@ -1074,6 +1080,7 @@ ProxyConfigServiceLinux::Delegate::Delegate(base::Environment* env_var_getter)
break;
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
+ // TODO(mdm): This is called in UI thread (bug 69057).
gconf_getter_.reset(new GConfSettingGetterImplKDE(env_var_getter));
break;
case base::nix::DESKTOP_ENVIRONMENT_XFCE:
« chrome/test/testing_profile.h ('K') | « net/proxy/multi_threaded_proxy_resolver.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698