| OLD | NEW |
| 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 #include "chrome/browser/importer/importer_list.h" | 5 #include "chrome/browser/importer/importer_list.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "chrome/browser/importer/firefox_importer_utils.h" | 8 #include "chrome/browser/importer/firefox_importer_utils.h" |
| 9 #include "chrome/browser/importer/importer_bridge.h" | 9 #include "chrome/browser/importer/importer_bridge.h" |
| 10 #include "chrome/browser/importer/importer_data_types.h" | |
| 11 #include "chrome/browser/importer/importer_list_observer.h" | 10 #include "chrome/browser/importer/importer_list_observer.h" |
| 12 #include "chrome/browser/shell_integration.h" | 11 #include "chrome/browser/shell_integration.h" |
| 12 #include "chrome/common/importer/importer_data_types.h" |
| 13 #include "grit/generated_resources.h" | 13 #include "grit/generated_resources.h" |
| 14 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
| 15 | 15 |
| 16 #if defined(OS_MACOSX) | 16 #if defined(OS_MACOSX) |
| 17 #include <CoreFoundation/CoreFoundation.h> | 17 #include <CoreFoundation/CoreFoundation.h> |
| 18 | 18 |
| 19 #include "base/mac/foundation_util.h" | 19 #include "base/mac/foundation_util.h" |
| 20 #include "chrome/browser/importer/safari_importer.h" | 20 #include "chrome/browser/importer/safari_importer.h" |
| 21 #endif | 21 #endif |
| 22 | 22 |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 source_profiles_.assign(profiles.begin(), profiles.end()); | 206 source_profiles_.assign(profiles.begin(), profiles.end()); |
| 207 source_profiles_loaded_ = true; | 207 source_profiles_loaded_ = true; |
| 208 source_thread_id_ = BrowserThread::UI; | 208 source_thread_id_ = BrowserThread::UI; |
| 209 | 209 |
| 210 observer_->OnSourceProfilesLoaded(); | 210 observer_->OnSourceProfilesLoaded(); |
| 211 observer_ = NULL; | 211 observer_ = NULL; |
| 212 | 212 |
| 213 // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed. | 213 // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed. |
| 214 is_observed_ = false; | 214 is_observed_ = false; |
| 215 } | 215 } |
| OLD | NEW |