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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "base/threading/thread.h" | 8 #include "base/threading/thread.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 18 matching lines...) Expand all Loading... |
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 "app/win/win_util.h" | 33 #include "app/win/win_util.h" |
34 #include "chrome/browser/ui/views/importer_lock_view.h" | 34 #include "chrome/browser/ui/views/importer_lock_view.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) |
39 #include "chrome/browser/gtk/import_lock_dialog_gtk.h" | 39 #include "chrome/browser/ui/gtk/import_lock_dialog_gtk.h" |
40 #endif | 40 #endif |
41 | 41 |
42 using webkit_glue::PasswordForm; | 42 using webkit_glue::PasswordForm; |
43 | 43 |
44 // Importer. | 44 // Importer. |
45 | 45 |
46 void Importer::Cancel() { cancelled_ = true; } | 46 void Importer::Cancel() { cancelled_ = true; } |
47 | 47 |
48 Importer::Importer() | 48 Importer::Importer() |
49 : cancelled_(false), | 49 : cancelled_(false), |
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 template_url_vec.reserve(template_urls.size()); | 611 template_url_vec.reserve(template_urls.size()); |
612 std::vector<TemplateURL>::const_iterator iter; | 612 std::vector<TemplateURL>::const_iterator iter; |
613 for (iter = template_urls.begin(); | 613 for (iter = template_urls.begin(); |
614 iter != template_urls.end(); | 614 iter != template_urls.end(); |
615 ++iter) { | 615 ++iter) { |
616 template_url_vec.push_back(new TemplateURL(*iter)); | 616 template_url_vec.push_back(new TemplateURL(*iter)); |
617 } | 617 } |
618 bridge_->SetKeywords(template_url_vec, default_keyword_index, | 618 bridge_->SetKeywords(template_url_vec, default_keyword_index, |
619 unique_on_host_and_path); | 619 unique_on_host_and_path); |
620 } | 620 } |
OLD | NEW |