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

Side by Side Diff: chrome/browser/importer/importer_list.cc

Issue 12321107: Move shell integration code from chrome/browser to apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 #include "chrome/browser/importer/importer_list.h" 5 #include "chrome/browser/importer/importer_list.h"
6 6
7 #include "apps/shell_integration.h"
7 #include "base/bind.h" 8 #include "base/bind.h"
8 #include "chrome/browser/first_run/first_run.h" 9 #include "chrome/browser/first_run/first_run.h"
9 #include "chrome/browser/importer/firefox_importer_utils.h" 10 #include "chrome/browser/importer/firefox_importer_utils.h"
10 #include "chrome/browser/importer/importer_bridge.h" 11 #include "chrome/browser/importer/importer_bridge.h"
11 #include "chrome/browser/importer/importer_data_types.h" 12 #include "chrome/browser/importer/importer_data_types.h"
12 #include "chrome/browser/importer/importer_list_observer.h" 13 #include "chrome/browser/importer/importer_list_observer.h"
13 #include "chrome/browser/shell_integration.h"
14 #include "grit/generated_resources.h" 14 #include "grit/generated_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 16
17 #if defined(OS_MACOSX) 17 #if defined(OS_MACOSX)
18 #include <CoreFoundation/CoreFoundation.h> 18 #include <CoreFoundation/CoreFoundation.h>
19 19
20 #include "base/mac/foundation_util.h" 20 #include "base/mac/foundation_util.h"
21 #include "chrome/browser/importer/safari_importer.h" 21 #include "chrome/browser/importer/safari_importer.h"
22 #endif 22 #endif
23 23
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 source_profiles_.assign(profiles.begin(), profiles.end()); 226 source_profiles_.assign(profiles.begin(), profiles.end());
227 source_profiles_loaded_ = true; 227 source_profiles_loaded_ = true;
228 source_thread_id_ = BrowserThread::UI; 228 source_thread_id_ = BrowserThread::UI;
229 229
230 observer_->OnSourceProfilesLoaded(); 230 observer_->OnSourceProfilesLoaded();
231 observer_ = NULL; 231 observer_ = NULL;
232 232
233 // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed. 233 // TODO(jhawkins): Remove once DetectSourceProfilesHack is removed.
234 is_observed_ = false; 234 is_observed_ = false;
235 } 235 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698