chrome/browser/history/history_service.cc - Issue 322113002: Move HistoryService::NotifyProfileError to HistoryClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/history/history_service.cc

Issue 322113002: Move HistoryService::NotifyProfileError to HistoryClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 6 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

Index: chrome/browser/history/history_service.cc

diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc

index a4513e1d6037cedcced8d0df6d9adf32428c5d04..bf1778836799a2cd2f19bf96dbc98161d280bf13 100644

--- a/chrome/browser/history/history_service.cc

+++ b/chrome/browser/history/history_service.cc

@@ -46,7 +46,6 @@

#include "chrome/browser/history/web_history_service.h"

#include "chrome/browser/history/web_history_service_factory.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/ui/profile_error_dialog.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/importer/imported_favicon_usage.h"

@@ -1034,10 +1033,8 @@ void HistoryService::SetInMemoryBackend(

void HistoryService::NotifyProfileError(sql::InitStatus init_status) {

DCHECK(thread_checker_.CalledOnValidThread());

- ShowProfileErrorDialog(

- PROFILE_ERROR_HISTORY,

- (init_status == sql::INIT_FAILURE) ?

- IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);

+ if (history_client_)

+ history_client_->NotifyProfileError(init_status);

}

void HistoryService::DeleteURL(const GURL& url) {

« no previous file with comments | « chrome/browser/history/chrome_history_client.cc ('k') | components/history/DEPS » ('j') | components/history/core/browser/history_client.h » ('J')