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

Side by Side Diff: chrome/browser/importer/ie_importer_browsertest_win.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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
« no previous file with comments | « chrome/browser/icon_manager.cc ('k') | chrome/browser/intranet_redirect_detector.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 // The order of these includes is important. 5 // The order of these includes is important.
6 #include <windows.h> 6 #include <windows.h>
7 #include <unknwn.h> 7 #include <unknwn.h>
8 #include <intshcut.h> 8 #include <intshcut.h>
9 #include <propvarutil.h> 9 #include <propvarutil.h>
10 #include <shlguid.h> 10 #include <shlguid.h>
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 kIEBookmarks[bookmark_count_])) << i; 315 kIEBookmarks[bookmark_count_])) << i;
316 ++bookmark_count_; 316 ++bookmark_count_;
317 } 317 }
318 } 318 }
319 319
320 virtual void AddKeyword(std::vector<TemplateURL*> template_url, 320 virtual void AddKeyword(std::vector<TemplateURL*> template_url,
321 int default_keyword_index) { 321 int default_keyword_index) {
322 // TODO(jcampan): bug 1169230: we should test keyword importing for IE. 322 // TODO(jcampan): bug 1169230: we should test keyword importing for IE.
323 // In order to do that we'll probably need to mock the Windows registry. 323 // In order to do that we'll probably need to mock the Windows registry.
324 NOTREACHED(); 324 NOTREACHED();
325 STLDeleteContainerPointers(template_url.begin(), template_url.end()); 325 base::STLDeleteContainerPointers(template_url.begin(), template_url.end());
326 } 326 }
327 327
328 void AddFavicons(const favicon_base::FaviconUsageDataList& usage) override { 328 void AddFavicons(const favicon_base::FaviconUsageDataList& usage) override {
329 // Importer should group the favicon information for each favicon URL. 329 // Importer should group the favicon information for each favicon URL.
330 for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) { 330 for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) {
331 GURL favicon_url(kIEFaviconGroup[i].favicon_url); 331 GURL favicon_url(kIEFaviconGroup[i].favicon_url);
332 std::set<GURL> urls; 332 std::set<GURL> urls;
333 for (size_t j = 0; j < arraysize(kIEFaviconGroup[i].site_url); ++j) 333 for (size_t j = 0; j < arraysize(kIEFaviconGroup[i].site_url); ++j)
334 urls.insert(GURL(kIEFaviconGroup[i].site_url[j])); 334 urls.insert(GURL(kIEFaviconGroup[i].site_url[j]));
335 335
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 source_profile.source_path = temp_dir_.path(); 648 source_profile.source_path = temp_dir_.path();
649 649
650 host->StartImportSettings( 650 host->StartImportSettings(
651 source_profile, 651 source_profile,
652 browser()->profile(), 652 browser()->profile(),
653 importer::HOME_PAGE, 653 importer::HOME_PAGE,
654 observer); 654 observer);
655 base::MessageLoop::current()->Run(); 655 base::MessageLoop::current()->Run();
656 } 656 }
657 657
OLDNEW
« no previous file with comments | « chrome/browser/icon_manager.cc ('k') | chrome/browser/intranet_redirect_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698