| 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/profile_writer.h" | 5 #include "chrome/browser/importer/profile_writer.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/thread.h" | 8 #include "base/thread.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 11 #include "chrome/browser/importer/importer.h" | 11 #include "chrome/browser/importer/importer.h" |
| 12 #include "chrome/browser/password_manager/password_store.h" | 12 #include "chrome/browser/password_manager/password_store.h" |
| 13 #include "chrome/browser/pref_service.h" | 13 #include "chrome/browser/prefs/pref_service.h" |
| 14 #include "chrome/browser/profile.h" | 14 #include "chrome/browser/profile.h" |
| 15 #include "chrome/browser/search_engines/template_url_model.h" | 15 #include "chrome/browser/search_engines/template_url_model.h" |
| 16 #include "chrome/common/notification_service.h" | 16 #include "chrome/common/notification_service.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 | 18 |
| 19 using webkit_glue::PasswordForm; | 19 using webkit_glue::PasswordForm; |
| 20 | 20 |
| 21 bool ProfileWriter::BookmarkModelIsLoaded() const { | 21 bool ProfileWriter::BookmarkModelIsLoaded() const { |
| 22 return profile_->GetBookmarkModel()->IsLoaded(); | 22 return profile_->GetBookmarkModel()->IsLoaded(); |
| 23 } | 23 } |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 ((!import_to_bookmark_bar || !entry.in_toolbar) && | 342 ((!import_to_bookmark_bar || !entry.in_toolbar) && |
| 343 parent != model->other_node()))) { | 343 parent != model->other_node()))) { |
| 344 found_match = false; | 344 found_match = false; |
| 345 } | 345 } |
| 346 | 346 |
| 347 if (found_match) | 347 if (found_match) |
| 348 return true; // Found a match with the same url path and title. | 348 return true; // Found a match with the same url path and title. |
| 349 } | 349 } |
| 350 return false; | 350 return false; |
| 351 } | 351 } |
| OLD | NEW |