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

Side by Side Diff: chrome/browser/dom_ui/options/import_data_handler.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
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/dom_ui/options/import_data_handler.h" 5 #include "chrome/browser/dom_ui/options/import_data_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/scoped_ptr.h" 10 #include "base/scoped_ptr.h"
11 #include "base/string16.h" 11 #include "base/string16.h"
12 #include "base/string_number_conversions.h" 12 #include "base/string_number_conversions.h"
13 #include "base/string_util.h" 13 #include "base/string_util.h"
14 #include "base/thread_restrictions.h" 14 #include "base/threading/thread_restrictions.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/prefs/pref_service.h" 17 #include "chrome/browser/prefs/pref_service.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "grit/chromium_strings.h" 19 #include "grit/chromium_strings.h"
20 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
21 #include "chrome/browser/importer/importer_data_types.h" 21 #include "chrome/browser/importer/importer_data_types.h"
22 22
23 ImportDataHandler::ImportDataHandler() : importer_host_(NULL) { 23 ImportDataHandler::ImportDataHandler() : importer_host_(NULL) {
24 } 24 }
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 browser_profile->SetBoolean("search", 156 browser_profile->SetBoolean("search",
157 (browser_services & importer::SEARCH_ENGINES) != 0); 157 (browser_services & importer::SEARCH_ENGINES) != 0);
158 158
159 browser_profiles.Append(browser_profile); 159 browser_profiles.Append(browser_profile);
160 } 160 }
161 161
162 dom_ui_->CallJavascriptFunction( 162 dom_ui_->CallJavascriptFunction(
163 L"options.ImportDataOverlay.updateSupportedBrowsers", 163 L"options.ImportDataOverlay.updateSupportedBrowsers",
164 browser_profiles); 164 browser_profiles);
165 } 165 }
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/advanced_options_utils_win.cc ('k') | chrome/browser/dom_ui/options/options_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698