OLD | NEW |
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/browser/importer/importer.h" | 5 #include "chrome/browser/importer/importer.h" |
6 | 6 |
7 #include "base/threading/thread.h" | 7 #include "base/threading/thread.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.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" |
19 #include "chrome/browser/search_engines/template_url_model.h" | 19 #include "chrome/browser/search_engines/template_url_model.h" |
20 #include "chrome/browser/tabs/tab_strip_model.h" | 20 #include "chrome/browser/tabs/tab_strip_model.h" |
21 #include "chrome/browser/ui/browser_navigator.h" | 21 #include "chrome/browser/ui/browser_navigator.h" |
22 #include "chrome/browser/webdata/web_data_service.h" | 22 #include "chrome/browser/webdata/web_data_service.h" |
23 #include "chrome/common/notification_source.h" | 23 #include "chrome/common/notification_source.h" |
24 #include "gfx/codec/png_codec.h" | |
25 #include "gfx/favicon_size.h" | |
26 #include "grit/generated_resources.h" | 24 #include "grit/generated_resources.h" |
27 #include "skia/ext/image_operations.h" | 25 #include "skia/ext/image_operations.h" |
28 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
| 27 #include "ui/gfx/codec/png_codec.h" |
| 28 #include "ui/gfx/favicon_size.h" |
29 #include "webkit/glue/image_decoder.h" | 29 #include "webkit/glue/image_decoder.h" |
30 | 30 |
31 // TODO(port): Port these files. | 31 // TODO(port): Port these files. |
32 #if defined(OS_WIN) | 32 #if defined(OS_WIN) |
33 #include "chrome/browser/ui/views/importer_lock_view.h" | 33 #include "chrome/browser/ui/views/importer_lock_view.h" |
34 #include "ui/base/message_box_win.h" | 34 #include "ui/base/message_box_win.h" |
35 #include "views/window/window.h" | 35 #include "views/window/window.h" |
36 #elif defined(OS_MACOSX) | 36 #elif defined(OS_MACOSX) |
37 #include "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h" | 37 #include "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h" |
38 #elif defined(TOOLKIT_USES_GTK) | 38 #elif defined(TOOLKIT_USES_GTK) |
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
587 template_url_vec.reserve(template_urls.size()); | 587 template_url_vec.reserve(template_urls.size()); |
588 std::vector<TemplateURL>::const_iterator iter; | 588 std::vector<TemplateURL>::const_iterator iter; |
589 for (iter = template_urls.begin(); | 589 for (iter = template_urls.begin(); |
590 iter != template_urls.end(); | 590 iter != template_urls.end(); |
591 ++iter) { | 591 ++iter) { |
592 template_url_vec.push_back(new TemplateURL(*iter)); | 592 template_url_vec.push_back(new TemplateURL(*iter)); |
593 } | 593 } |
594 bridge_->SetKeywords(template_url_vec, default_keyword_index, | 594 bridge_->SetKeywords(template_url_vec, default_keyword_index, |
595 unique_on_host_and_path); | 595 unique_on_host_and_path); |
596 } | 596 } |
OLD | NEW |