chrome/browser/importer/importer.cc - Issue 3035: Move importer files into an importer subdirectory.

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 3035: Move importer files into an importer subdirectory. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « chrome/browser/importer/importer.h ('k') | chrome/browser/importer/importer_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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.h"	5 #include "chrome/browser/importer/importer.h"

6	6

7 #include <map>	7 #include <map>

8	8

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

10 #include "base/gfx/image_operations.h"	10 #include "base/gfx/image_operations.h"

11 #include "base/gfx/png_encoder.h"	11 #include "base/gfx/png_encoder.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

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

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

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

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

17 #include "chrome/browser/firefox_importer_utils.h"	17 #include "chrome/browser/importer/firefox_importer_utils.h"

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

19 #include "chrome/browser/ie_importer.h"	19 #include "chrome/browser/importer/ie_importer.h"

20 #include "chrome/browser/template_url_model.h"	20 #include "chrome/browser/template_url_model.h"

21 #include "chrome/browser/shell_integration.h"	21 #include "chrome/browser/shell_integration.h"

22 #include "chrome/browser/webdata/web_data_service.h"	22 #include "chrome/browser/webdata/web_data_service.h"

23 #include "chrome/common/gfx/favicon_size.h"	23 #include "chrome/common/gfx/favicon_size.h"

24 #include "chrome/common/l10n_util.h"	24 #include "chrome/common/l10n_util.h"

25 #include "chrome/common/pref_names.h"	25 #include "chrome/common/pref_names.h"

26 #include "chrome/common/pref_service.h"	26 #include "chrome/common/pref_service.h"

27 #include "chrome/views/window.h"	27 #include "chrome/views/window.h"

28 #include "webkit/glue/image_decoder.h"	28 #include "webkit/glue/image_decoder.h"

29	29

(...skipping 502 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
532 if (!source_path.empty()) {	532 if (!source_path.empty()) {

533 ProfileInfo* firefox = new ProfileInfo();	533 ProfileInfo* firefox = new ProfileInfo();

534 firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);	534 firefox->description = l10n_util::GetString(IDS_IMPORT_FROM_FIREFOX);

535 firefox->browser_type = firefox_type;	535 firefox->browser_type = firefox_type;

536 firefox->source_path = source_path;	536 firefox->source_path = source_path;

537 firefox->app_path = GetFirefoxInstallPath();	537 firefox->app_path = GetFirefoxInstallPath();

538 source_profiles_.push_back(firefox);	538 source_profiles_.push_back(firefox);

539 }	539 }

540 }	540 }

541	541

OLD	NEW