| 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/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_navigator.h" | |
| 13 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 14 #include "chrome/browser/browser_thread.h" | 13 #include "chrome/browser/browser_thread.h" |
| 15 #include "chrome/browser/browsing_instance.h" | 14 #include "chrome/browser/browsing_instance.h" |
| 16 #include "chrome/browser/importer/firefox_profile_lock.h" | 15 #include "chrome/browser/importer/firefox_profile_lock.h" |
| 17 #include "chrome/browser/importer/importer_bridge.h" | 16 #include "chrome/browser/importer/importer_bridge.h" |
| 18 #include "chrome/browser/renderer_host/site_instance.h" | 17 #include "chrome/browser/renderer_host/site_instance.h" |
| 19 #include "chrome/browser/search_engines/template_url.h" | 18 #include "chrome/browser/search_engines/template_url.h" |
| 20 #include "chrome/browser/search_engines/template_url_model.h" | 19 #include "chrome/browser/search_engines/template_url_model.h" |
| 21 #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" |
| 22 #include "chrome/browser/webdata/web_data_service.h" | 22 #include "chrome/browser/webdata/web_data_service.h" |
| 23 #include "chrome/common/notification_service.h" | 23 #include "chrome/common/notification_service.h" |
| 24 #include "gfx/codec/png_codec.h" | 24 #include "gfx/codec/png_codec.h" |
| 25 #include "gfx/favicon_size.h" | 25 #include "gfx/favicon_size.h" |
| 26 #include "grit/generated_resources.h" | 26 #include "grit/generated_resources.h" |
| 27 #include "skia/ext/image_operations.h" | 27 #include "skia/ext/image_operations.h" |
| 28 #include "webkit/glue/image_decoder.h" | 28 #include "webkit/glue/image_decoder.h" |
| 29 | 29 |
| 30 // TODO(port): Port these files. | 30 // TODO(port): Port these files. |
| 31 #if defined(OS_WIN) | 31 #if defined(OS_WIN) |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 template_url_vec.reserve(template_urls.size()); | 583 template_url_vec.reserve(template_urls.size()); |
| 584 std::vector<TemplateURL>::const_iterator iter; | 584 std::vector<TemplateURL>::const_iterator iter; |
| 585 for (iter = template_urls.begin(); | 585 for (iter = template_urls.begin(); |
| 586 iter != template_urls.end(); | 586 iter != template_urls.end(); |
| 587 ++iter) { | 587 ++iter) { |
| 588 template_url_vec.push_back(new TemplateURL(*iter)); | 588 template_url_vec.push_back(new TemplateURL(*iter)); |
| 589 } | 589 } |
| 590 bridge_->SetKeywords(template_url_vec, default_keyword_index, | 590 bridge_->SetKeywords(template_url_vec, default_keyword_index, |
| 591 unique_on_host_and_path); | 591 unique_on_host_and_path); |
| 592 } | 592 } |
| OLD | NEW |