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

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

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove webkit strings that no longer exist Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/utility/importer/DEPS ('k') | chrome/utility/importer/firefox_importer.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "chrome/utility/importer/bookmarks_file_importer.h" 5 #include "chrome/utility/importer/bookmarks_file_importer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "chrome/common/importer/imported_bookmark_entry.h" 8 #include "chrome/common/importer/imported_bookmark_entry.h"
9 #include "chrome/common/importer/imported_favicon_usage.h" 9 #include "chrome/common/importer/imported_favicon_usage.h"
10 #include "chrome/common/importer/importer_bridge.h" 10 #include "chrome/common/importer/importer_bridge.h"
11 #include "chrome/common/importer/importer_data_types.h" 11 #include "chrome/common/importer/importer_data_types.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "chrome/grit/generated_resources.h"
13 #include "chrome/utility/importer/bookmark_html_reader.h" 14 #include "chrome/utility/importer/bookmark_html_reader.h"
14 #include "components/url_fixer/url_fixer.h" 15 #include "components/url_fixer/url_fixer.h"
15 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
16 #include "grit/generated_resources.h"
17 17
18 namespace { 18 namespace {
19 19
20 bool IsImporterCancelled(BookmarksFileImporter* importer) { 20 bool IsImporterCancelled(BookmarksFileImporter* importer) {
21 return importer->cancelled(); 21 return importer->cancelled();
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 namespace internal { 26 namespace internal {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 base::string16 first_folder_name = 103 base::string16 first_folder_name =
104 bridge->GetLocalizedString(IDS_BOOKMARK_GROUP); 104 bridge->GetLocalizedString(IDS_BOOKMARK_GROUP);
105 bridge->AddBookmarks(bookmarks, first_folder_name); 105 bridge->AddBookmarks(bookmarks, first_folder_name);
106 } 106 }
107 if (!favicons.empty()) 107 if (!favicons.empty())
108 bridge->SetFavicons(favicons); 108 bridge->SetFavicons(favicons);
109 109
110 bridge->NotifyItemEnded(importer::FAVORITES); 110 bridge->NotifyItemEnded(importer::FAVORITES);
111 bridge->NotifyEnded(); 111 bridge->NotifyEnded();
112 } 112 }
OLDNEW
« no previous file with comments | « chrome/utility/importer/DEPS ('k') | chrome/utility/importer/firefox_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698