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

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

Issue 113169: Move win_util.h from common to app. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 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/importer/ie_importer.cc ('k') | chrome/browser/importer/importer_unittest.cc » ('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) 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/importer.h" 5 #include "chrome/browser/importer/importer.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "app/gfx/favicon_size.h" 10 #include "app/gfx/favicon_size.h"
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #if defined(OS_WIN)
13 #include "app/win_util.h"
14 #endif
12 #include "base/file_util.h" 15 #include "base/file_util.h"
13 #include "base/gfx/png_encoder.h" 16 #include "base/gfx/png_encoder.h"
14 #include "base/string_util.h" 17 #include "base/string_util.h"
15 #include "chrome/browser/bookmarks/bookmark_model.h" 18 #include "chrome/browser/bookmarks/bookmark_model.h"
16 #include "chrome/browser/browser.h" 19 #include "chrome/browser/browser.h"
17 #include "chrome/browser/browser_list.h" 20 #include "chrome/browser/browser_list.h"
18 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/first_run.h" 22 #include "chrome/browser/first_run.h"
20 #include "chrome/browser/importer/firefox2_importer.h" 23 #include "chrome/browser/importer/firefox2_importer.h"
21 #include "chrome/browser/importer/firefox3_importer.h" 24 #include "chrome/browser/importer/firefox3_importer.h"
(...skipping 10 matching lines...) Expand all
32 #include "chrome/common/notification_service.h" 35 #include "chrome/common/notification_service.h"
33 #include "chrome/common/pref_names.h" 36 #include "chrome/common/pref_names.h"
34 #include "chrome/common/pref_service.h" 37 #include "chrome/common/pref_service.h"
35 #include "grit/generated_resources.h" 38 #include "grit/generated_resources.h"
36 #include "skia/ext/image_operations.h" 39 #include "skia/ext/image_operations.h"
37 #include "webkit/glue/image_decoder.h" 40 #include "webkit/glue/image_decoder.h"
38 41
39 // TODO(port): Port these files. 42 // TODO(port): Port these files.
40 #if defined(OS_WIN) 43 #if defined(OS_WIN)
41 #include "chrome/browser/views/importer_lock_view.h" 44 #include "chrome/browser/views/importer_lock_view.h"
42 #include "chrome/common/win_util.h"
43 #include "views/window/window.h" 45 #include "views/window/window.h"
44 #endif 46 #endif
45 47
46 // ProfileWriter. 48 // ProfileWriter.
47 49
48 bool ProfileWriter::BookmarkModelIsLoaded() const { 50 bool ProfileWriter::BookmarkModelIsLoaded() const {
49 return profile_->GetBookmarkModel()->IsLoaded(); 51 return profile_->GetBookmarkModel()->IsLoaded();
50 } 52 }
51 53
52 void ProfileWriter::AddBookmarkModelObserver(BookmarkModelObserver* observer) { 54 void ProfileWriter::AddBookmarkModelObserver(BookmarkModelObserver* observer) {
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 ProfileInfo* google_toolbar = new ProfileInfo(); 757 ProfileInfo* google_toolbar = new ProfileInfo();
756 google_toolbar->browser_type = GOOGLE_TOOLBAR5; 758 google_toolbar->browser_type = GOOGLE_TOOLBAR5;
757 google_toolbar->description = l10n_util::GetString( 759 google_toolbar->description = l10n_util::GetString(
758 IDS_IMPORT_FROM_GOOGLE_TOOLBAR); 760 IDS_IMPORT_FROM_GOOGLE_TOOLBAR);
759 google_toolbar->source_path.clear(); 761 google_toolbar->source_path.clear();
760 google_toolbar->app_path.clear(); 762 google_toolbar->app_path.clear();
761 google_toolbar->services_supported = FAVORITES; 763 google_toolbar->services_supported = FAVORITES;
762 source_profiles_.push_back(google_toolbar); 764 source_profiles_.push_back(google_toolbar);
763 } 765 }
764 } 766 }
OLDNEW
« no previous file with comments | « chrome/browser/importer/ie_importer.cc ('k') | chrome/browser/importer/importer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698