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

Side by Side Diff: chrome/profile_import/profile_import_thread.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 9 years, 3 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/sync/util/weak_handle_unittest.cc ('k') | chrome_frame/chrome_frame_delegate.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_import/profile_import_thread.h" 5 #include "chrome/profile_import/profile_import_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/location.h"
10 #include "base/message_loop.h" 11 #include "base/message_loop.h"
11 #include "base/threading/thread.h" 12 #include "base/threading/thread.h"
12 #include "base/values.h" 13 #include "base/values.h"
13 #include "chrome/browser/importer/external_process_importer_bridge.h" 14 #include "chrome/browser/importer/external_process_importer_bridge.h"
14 #include "chrome/browser/importer/importer.h" 15 #include "chrome/browser/importer/importer.h"
15 #include "chrome/browser/importer/importer_type.h" 16 #include "chrome/browser/importer/importer_type.h"
16 #include "chrome/browser/importer/profile_import_process_messages.h" 17 #include "chrome/browser/importer/profile_import_process_messages.h"
17 #include "chrome/browser/search_engines/template_url.h" 18 #include "chrome/browser/search_engines/template_url.h"
18 #include "content/common/child_process.h" 19 #include "content/common/child_process.h"
19 #include "googleurl/src/gurl.h" 20 #include "googleurl/src/gurl.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(urls, 187 Send(new ProfileImportProcessHostMsg_NotifyKeywordsReady(urls,
187 default_keyword_index, unique_on_host_and_path)); 188 default_keyword_index, unique_on_host_and_path));
188 } 189 }
189 190
190 void ProfileImportThread::Cleanup() { 191 void ProfileImportThread::Cleanup() {
191 importer_->Cancel(); 192 importer_->Cancel();
192 importer_ = NULL; 193 importer_ = NULL;
193 bridge_ = NULL; 194 bridge_ = NULL;
194 ChildProcess::current()->ReleaseProcess(); 195 ChildProcess::current()->ReleaseProcess();
195 } 196 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/util/weak_handle_unittest.cc ('k') | chrome_frame/chrome_frame_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698