chrome/browser/signin/easy_unlock_app_manager.cc - Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*.

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/signin/easy_unlock_app_manager.cc

Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix mismerge Created 5 years, 8 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

« chrome/browser/safe_browsing/remote_database_manager.cc ('K') | « chrome/browser/safe_browsing/test_database_manager.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/easy_unlock_app_manager.cc

diff --git a/chrome/browser/signin/easy_unlock_app_manager.cc b/chrome/browser/signin/easy_unlock_app_manager.cc

index f9469b784a740bcd50a23f13b9548dbfa9c1d9c8..7d5799ebcae1b8b6fe819b919754156c40656ed6 100644

--- a/chrome/browser/signin/easy_unlock_app_manager.cc

+++ b/chrome/browser/signin/easy_unlock_app_manager.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/signin/easy_unlock_app_manager.h"

#include "base/command_line.h"

+#include "base/location.h"

mattm 2015/04/29 22:59:59 ?

Nathan Parker 2015/05/04 21:17:19 Yea... This is required for FROM_HERE to be define

mattm 2015/05/06 02:42:45 ah, makes sense. Thanks.

#include "chrome/browser/extensions/component_loader.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/ui/extensions/application_launch.h"

« chrome/browser/safe_browsing/remote_database_manager.cc ('K') | « chrome/browser/safe_browsing/test_database_manager.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »