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

Unified Diff: chrome/utility/importer/firefox_importer.cc

Issue 635623003: Cleanup: Better constify some strings in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/utility/extensions/unpacker_unittest.cc ('k') | chrome/utility/importer/nss_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/utility/importer/firefox_importer.cc
diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc
index e54032b76ed749c2660f39b33a31c032389625ab..fdb14cd09472b666bb08d0070c65b2e20c471719 100644
--- a/chrome/utility/importer/firefox_importer.cc
+++ b/chrome/utility/importer/firefox_importer.cc
@@ -15,7 +15,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/importer/firefox_importer_utils.h"
-#include "chrome/common/importer/firefox_importer_utils.h"
#include "chrome/common/importer/imported_bookmark_entry.h"
#include "chrome/common/importer/imported_favicon_usage.h"
#include "chrome/common/importer/importer_autofill_form_data_entry.h"
@@ -638,9 +637,9 @@ void FirefoxImporter::LoadRootNodeID(sql::Connection* db,
int* toolbar_folder_id,
int* menu_folder_id,
int* unsorted_folder_id) {
- static const char* kToolbarFolderName = "toolbar";
- static const char* kMenuFolderName = "menu";
- static const char* kUnsortedFolderName = "unfiled";
+ static const char kToolbarFolderName[] = "toolbar";
+ static const char kMenuFolderName[] = "menu";
+ static const char kUnsortedFolderName[] = "unfiled";
const char query[] = "SELECT root_name, folder_id FROM moz_bookmarks_roots";
sql::Statement s(db->GetUniqueStatement(query));
@@ -659,7 +658,7 @@ void FirefoxImporter::LoadRootNodeID(sql::Connection* db,
void FirefoxImporter::LoadLivemarkIDs(sql::Connection* db,
std::set<int>* livemark) {
- static const char* kFeedAnnotation = "livemark/feedURI";
+ static const char kFeedAnnotation[] = "livemark/feedURI";
livemark->clear();
const char query[] =
« no previous file with comments | « chrome/utility/extensions/unpacker_unittest.cc ('k') | chrome/utility/importer/nss_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698