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

Side by Side Diff: chrome/utility/importer/ie_importer_win.cc

Issue 254763005: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve a merge conflict. Created 6 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/utility/importer/ie_importer_win.h" 5 #include "chrome/utility/importer/ie_importer_win.h"
6 6
7 #include <ole2.h> 7 #include <ole2.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 #include <urlhist.h> 10 #include <urlhist.h>
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 if (!bookmarks.empty() && !cancelled()) { 461 if (!bookmarks.empty() && !cancelled()) {
462 const base::string16& first_folder_name = 462 const base::string16& first_folder_name =
463 l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_IE); 463 l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_IE);
464 bridge_->AddBookmarks(bookmarks, first_folder_name); 464 bridge_->AddBookmarks(bookmarks, first_folder_name);
465 } 465 }
466 if (!favicons.empty() && !cancelled()) 466 if (!favicons.empty() && !cancelled())
467 bridge_->SetFavicons(favicons); 467 bridge_->SetFavicons(favicons);
468 } 468 }
469 469
470 void IEImporter::ImportHistory() { 470 void IEImporter::ImportHistory() {
471 const std::string kSchemes[] = {content::kHttpScheme, 471 const std::string kSchemes[] = {url::kHttpScheme,
472 content::kHttpsScheme, 472 url::kHttpsScheme,
473 content::kFtpScheme, 473 content::kFtpScheme,
474 content::kFileScheme}; 474 content::kFileScheme};
475 int total_schemes = arraysize(kSchemes); 475 int total_schemes = arraysize(kSchemes);
476 476
477 base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2; 477 base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
478 HRESULT result; 478 HRESULT result;
479 result = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL, 479 result = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
480 CLSCTX_INPROC_SERVER); 480 CLSCTX_INPROC_SERVER);
481 if (FAILED(result)) 481 if (FAILED(result))
482 return; 482 return;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 item.Release(); 595 item.Release();
596 pstore.Release(); 596 pstore.Release();
597 FreeLibrary(pstorec_dll); 597 FreeLibrary(pstorec_dll);
598 598
599 size_t i; 599 size_t i;
600 for (i = 0; i < ac_list.size(); i++) { 600 for (i = 0; i < ac_list.size(); i++) {
601 if (!ac_list[i].is_url || ac_list[i].data.size() < 2) 601 if (!ac_list[i].is_url || ac_list[i].data.size() < 2)
602 continue; 602 continue;
603 603
604 GURL url(ac_list[i].key.c_str()); 604 GURL url(ac_list[i].key.c_str());
605 if (!(LowerCaseEqualsASCII(url.scheme(), content::kHttpScheme) || 605 if (!(LowerCaseEqualsASCII(url.scheme(), url::kHttpScheme) ||
606 LowerCaseEqualsASCII(url.scheme(), content::kHttpsScheme))) { 606 LowerCaseEqualsASCII(url.scheme(), url::kHttpsScheme))) {
607 continue; 607 continue;
608 } 608 }
609 609
610 autofill::PasswordForm form; 610 autofill::PasswordForm form;
611 GURL::Replacements rp; 611 GURL::Replacements rp;
612 rp.ClearUsername(); 612 rp.ClearUsername();
613 rp.ClearPassword(); 613 rp.ClearPassword();
614 rp.ClearQuery(); 614 rp.ClearQuery();
615 rp.ClearRef(); 615 rp.ClearRef();
616 form.origin = url.ReplaceComponents(rp); 616 form.origin = url.ReplaceComponents(rp);
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 static int version = -1; 872 static int version = -1;
873 if (version < 0) { 873 if (version < 0) {
874 wchar_t buffer[128]; 874 wchar_t buffer[128];
875 DWORD buffer_length = sizeof(buffer); 875 DWORD buffer_length = sizeof(buffer);
876 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ); 876 base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
877 LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL); 877 LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
878 version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0); 878 version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
879 } 879 }
880 return version; 880 return version;
881 } 881 }
OLDNEW
« no previous file with comments | « chrome/renderer/safe_browsing/phishing_classifier.cc ('k') | components/autofill/content/renderer/autofill_agent.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698