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

Side by Side Diff: chrome/browser/importer/profile_writer.h

Issue 7056033: Style cleanup in bookmarks import code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_ 5 #ifndef CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
6 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_ 6 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 // which bookmarks are added. If the bitmask contains IMPORT_TO_BOOKMARK_BAR, 83 // which bookmarks are added. If the bitmask contains IMPORT_TO_BOOKMARK_BAR,
84 // then any entries with a value of true for in_toolbar are added to 84 // then any entries with a value of true for in_toolbar are added to
85 // the bookmark bar. If the bitmask does not contain IMPORT_TO_BOOKMARK_BAR 85 // the bookmark bar. If the bitmask does not contain IMPORT_TO_BOOKMARK_BAR
86 // then the folder name the bookmarks are added to is uniqued based on 86 // then the folder name the bookmarks are added to is uniqued based on
87 // |first_folder_name|. For example, if |first_folder_name| is 'foo' 87 // |first_folder_name|. For example, if |first_folder_name| is 'foo'
88 // and a folder with the name 'foo' already exists in the other 88 // and a folder with the name 'foo' already exists in the other
89 // bookmarks folder, then the folder name 'foo 2' is used. 89 // bookmarks folder, then the folder name 'foo 2' is used.
90 // If |options| contains ADD_IF_UNIQUE, then the bookmark is added only 90 // If |options| contains ADD_IF_UNIQUE, then the bookmark is added only
91 // if another bookmarks does not exist with the same title, path and 91 // if another bookmarks does not exist with the same title, path and
92 // url. 92 // url.
93 virtual void AddBookmarkEntry(const std::vector<BookmarkEntry>& bookmark, 93 virtual void AddBookmarks(const std::vector<BookmarkEntry>& bookmark,
94 const string16& first_folder_name, 94 const string16& first_folder_name,
95 int options); 95 int options);
96 96
97 virtual void AddFavicons( 97 virtual void AddFavicons(
98 const std::vector<history::ImportedFaviconUsage>& favicons); 98 const std::vector<history::ImportedFaviconUsage>& favicons);
99 99
100 // Add the TemplateURLs in |template_urls| to the local store and make the 100 // Add the TemplateURLs in |template_urls| to the local store and make the
101 // TemplateURL at |default_keyword_index| the default keyword (does not set 101 // TemplateURL at |default_keyword_index| the default keyword (does not set
102 // a default keyword if it is -1). The local store becomes the owner of the 102 // a default keyword if it is -1). The local store becomes the owner of the
103 // TemplateURLs. Some TemplateURLs in |template_urls| may conflict (same 103 // TemplateURLs. Some TemplateURLs in |template_urls| may conflict (same
104 // keyword or same host name in the URL) with existing TemplateURLs in the 104 // keyword or same host name in the URL) with existing TemplateURLs in the
105 // local store, in which case the existing ones takes precedence and the 105 // local store, in which case the existing ones takes precedence and the
(...skipping 27 matching lines...) Expand all
133 const BookmarkEntry& entry, 133 const BookmarkEntry& entry,
134 const string16& first_folder_name, 134 const string16& first_folder_name,
135 bool import_to_bookmark_bar); 135 bool import_to_bookmark_bar);
136 136
137 Profile* const profile_; 137 Profile* const profile_;
138 138
139 DISALLOW_COPY_AND_ASSIGN(ProfileWriter); 139 DISALLOW_COPY_AND_ASSIGN(ProfileWriter);
140 }; 140 };
141 141
142 #endif // CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_ 142 #endif // CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698