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

Side by Side Diff: chrome/browser/ui/webui/options/advanced_options_utils_gtk.cc

Issue 6672070: Move the remaining files in chrome\common to content\common. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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
« no previous file with comments | « chrome/browser/ui/views/uninstall_view.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #if !defined(OS_CHROMEOS) 5 #if !defined(OS_CHROMEOS)
6 6
7 #include "chrome/browser/ui/webui/options/advanced_options_utils.h" 7 #include "chrome/browser/ui/webui/options/advanced_options_utils.h"
8 8
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/nix/xdg_util.h" 11 #include "base/nix/xdg_util.h"
12 #include "base/process_util.h" 12 #include "base/process_util.h"
13 #include "base/string_tokenizer.h" 13 #include "base/string_tokenizer.h"
14 #include "chrome/common/process_watcher.h"
15 #include "chrome/browser/browser_list.h" 14 #include "chrome/browser/browser_list.h"
16 #include "content/browser/browser_thread.h" 15 #include "content/browser/browser_thread.h"
17 #include "content/browser/tab_contents/tab_contents.h" 16 #include "content/browser/tab_contents/tab_contents.h"
17 #include "content/common/process_watcher.h"
18 #include "ui/base/gtk/gtk_signal.h" 18 #include "ui/base/gtk/gtk_signal.h"
19 19
20 // Command used to configure GNOME proxy settings. The command was renamed 20 // Command used to configure GNOME proxy settings. The command was renamed
21 // in January 2009, so both are used to work on both old and new systems. 21 // in January 2009, so both are used to work on both old and new systems.
22 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL}; 22 const char* kOldGNOMEProxyConfigCommand[] = {"gnome-network-preferences", NULL};
23 const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL}; 23 const char* kGNOMEProxyConfigCommand[] = {"gnome-network-properties", NULL};
24 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure. 24 // KDE3 and KDE4 are only slightly different, but incompatible. Go figure.
25 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL}; 25 const char* kKDE3ProxyConfigCommand[] = {"kcmshell", "proxy", NULL};
26 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL}; 26 const char* kKDE4ProxyConfigCommand[] = {"kcmshell4", "proxy", NULL};
27 27
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 } // anonymous namespace 137 } // anonymous namespace
138 138
139 void AdvancedOptionsUtilities::ShowNetworkProxySettings( 139 void AdvancedOptionsUtilities::ShowNetworkProxySettings(
140 TabContents* tab_contents) { 140 TabContents* tab_contents) {
141 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 141 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
142 NewRunnableFunction(&DetectAndStartProxyConfigUtil, tab_contents)); 142 NewRunnableFunction(&DetectAndStartProxyConfigUtil, tab_contents));
143 } 143 }
144 144
145 #endif // !defined(OS_CHROMEOS) 145 #endif // !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/uninstall_view.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698