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

Side by Side Diff: components/history/core/browser/history_database.cc

Issue 2107493002: Offer user to send feedback from profile error dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unused variable Created 4 years, 5 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 "components/history/core/browser/history_database.h" 5 #include "components/history/core/browser/history_database.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 void HistoryDatabase::BeginTransaction() { 253 void HistoryDatabase::BeginTransaction() {
254 db_.BeginTransaction(); 254 db_.BeginTransaction();
255 } 255 }
256 256
257 void HistoryDatabase::CommitTransaction() { 257 void HistoryDatabase::CommitTransaction() {
258 db_.CommitTransaction(); 258 db_.CommitTransaction();
259 } 259 }
260 260
261 void HistoryDatabase::RollbackTransaction() { 261 void HistoryDatabase::RollbackTransaction() {
262 db_.RollbackTransaction(); 262 if (db_.transaction_nesting())
263 db_.RollbackTransaction();
263 } 264 }
264 265
265 bool HistoryDatabase::RecreateAllTablesButURL() { 266 bool HistoryDatabase::RecreateAllTablesButURL() {
266 if (!DropVisitTable()) 267 if (!DropVisitTable())
267 return false; 268 return false;
268 if (!InitVisitTable()) 269 if (!InitVisitTable())
269 return false; 270 return false;
270 271
271 if (!DropKeywordSearchTermsTable()) 272 if (!DropKeywordSearchTermsTable())
272 return false; 273 return false;
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 "SET visit_time = visit_time + 11644473600000000 " 538 "SET visit_time = visit_time + 11644473600000000 "
538 "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);")); 539 "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
539 ignore_result(db_.Execute( 540 ignore_result(db_.Execute(
540 "UPDATE segment_usage " 541 "UPDATE segment_usage "
541 "SET time_slot = time_slot + 11644473600000000 " 542 "SET time_slot = time_slot + 11644473600000000 "
542 "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);")); 543 "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
543 } 544 }
544 #endif 545 #endif
545 546
546 } // namespace history 547 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698