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

Side by Side Diff: chrome/browser/ui/webui/options2/advanced_options_utils_x11.cc

Issue 10698140: Remove "2" suffixes from options2 code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options2/advanced_options_utils2.h" 7 #include "chrome/browser/ui/webui/options2/advanced_options_utils.h"
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
11 #include "base/file_path.h" 11 #include "base/file_path.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/nix/xdg_util.h" 13 #include "base/nix/xdg_util.h"
14 #include "base/process_util.h" 14 #include "base/process_util.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "chrome/browser/tab_contents/tab_util.h" 16 #include "chrome/browser/tab_contents/tab_util.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 WebContents* web_contents) { 149 WebContents* web_contents) {
150 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, 150 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
151 base::Bind(&DetectAndStartProxyConfigUtil, 151 base::Bind(&DetectAndStartProxyConfigUtil,
152 web_contents->GetRenderProcessHost()->GetID(), 152 web_contents->GetRenderProcessHost()->GetID(),
153 web_contents->GetRenderViewHost()->GetRoutingID())); 153 web_contents->GetRenderViewHost()->GetRoutingID()));
154 } 154 }
155 155
156 } // namespace options2 156 } // namespace options2
157 157
158 #endif // !defined(OS_CHROMEOS) 158 #endif // !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698