chrome/browser/importer/importer.cc - Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location....

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/importer/importer.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/icon_loader_win.cc ('k') | chrome/browser/importer/profile_writer.cc » ('j') | no next file with comments »

OLD	NEW
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/importer/importer.h"	5 #include "chrome/browser/importer/importer.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/thread.h"	8 #include "base/threading/thread.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/bookmarks/bookmark_model.h"	10 #include "chrome/browser/bookmarks/bookmark_model.h"

11 #include "chrome/browser/browser_list.h"	11 #include "chrome/browser/browser_list.h"

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/browser_thread.h"	13 #include "chrome/browser/browser_thread.h"

14 #include "chrome/browser/browsing_instance.h"	14 #include "chrome/browser/browsing_instance.h"

15 #include "chrome/browser/importer/firefox_profile_lock.h"	15 #include "chrome/browser/importer/firefox_profile_lock.h"

16 #include "chrome/browser/importer/importer_bridge.h"	16 #include "chrome/browser/importer/importer_bridge.h"

17 #include "chrome/browser/renderer_host/site_instance.h"	17 #include "chrome/browser/renderer_host/site_instance.h"

18 #include "chrome/browser/search_engines/template_url.h"	18 #include "chrome/browser/search_engines/template_url.h"

(...skipping 590 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
609 template_url_vec.reserve(template_urls.size());	609 template_url_vec.reserve(template_urls.size());

610 std::vector<TemplateURL>::const_iterator iter;	610 std::vector<TemplateURL>::const_iterator iter;

611 for (iter = template_urls.begin();	611 for (iter = template_urls.begin();

612 iter != template_urls.end();	612 iter != template_urls.end();

613 ++iter) {	613 ++iter) {

614 template_url_vec.push_back(new TemplateURL(*iter));	614 template_url_vec.push_back(new TemplateURL(*iter));

615 }	615 }

616 bridge_->SetKeywords(template_url_vec, default_keyword_index,	616 bridge_->SetKeywords(template_url_vec, default_keyword_index,

617 unique_on_host_and_path);	617 unique_on_host_and_path);

618 }	618 }

OLD	NEW