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

Side by Side Diff: chrome/browser/gtk/options/advanced_contents_gtk.cc

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/gtk/dialogs_gtk.cc ('k') | chrome/browser/icon_loader_linux.cc » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/options/advanced_contents_gtk.h" 5 #include "chrome/browser/gtk/options/advanced_contents_gtk.h"
6 6
7 #include <sys/types.h> 7 #include <sys/types.h>
8 #include <sys/wait.h> 8 #include <sys/wait.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "app/gtk_signal.h" 13 #include "app/gtk_signal.h"
14 #include "app/l10n_util.h" 14 #include "app/l10n_util.h"
15 #include "base/basictypes.h" 15 #include "base/basictypes.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/environment.h" 17 #include "base/environment.h"
18 #include "base/file_util.h" 18 #include "base/file_util.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/process_util.h" 20 #include "base/process_util.h"
21 #include "base/string_tokenizer.h" 21 #include "base/string_tokenizer.h"
22 #include "base/thread_restrictions.h" 22 #include "base/threading/thread_restrictions.h"
23 #include "base/nix/xdg_util.h" 23 #include "base/nix/xdg_util.h"
24 #include "chrome/browser/browser_list.h" 24 #include "chrome/browser/browser_list.h"
25 #include "chrome/browser/browser_process.h" 25 #include "chrome/browser/browser_process.h"
26 #include "chrome/browser/download/download_manager.h" 26 #include "chrome/browser/download/download_manager.h"
27 #include "chrome/browser/download/download_prefs.h" 27 #include "chrome/browser/download/download_prefs.h"
28 #include "chrome/browser/fonts_languages_window.h" 28 #include "chrome/browser/fonts_languages_window.h"
29 #include "chrome/browser/google/google_util.h" 29 #include "chrome/browser/google/google_util.h"
30 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" 30 #include "chrome/browser/gtk/accessible_widget_helper_gtk.h"
31 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h" 31 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
32 #include "chrome/browser/gtk/gtk_chrome_link_button.h" 32 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
(...skipping 1176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT), 1209 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT),
1210 web_content_section_->get_page_widget(), false); 1210 web_content_section_->get_page_widget(), false);
1211 1211
1212 security_section_.reset(new SecuritySection(profile_)); 1212 security_section_.reset(new SecuritySection(profile_));
1213 options_builder->AddOptionGroup( 1213 options_builder->AddOptionGroup(
1214 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY), 1214 l10n_util::GetStringUTF8(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY),
1215 security_section_->get_page_widget(), false); 1215 security_section_->get_page_widget(), false);
1216 1216
1217 page_ = options_builder->get_page_widget(); 1217 page_ = options_builder->get_page_widget();
1218 } 1218 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/dialogs_gtk.cc ('k') | chrome/browser/icon_loader_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698