chrome/browser/chromeos/login/merge_session_load_page.cc - Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.

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/chromeos/login/merge_session_load_page.cc

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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/chromeos/extensions/input_method_api.cc ('K') | « chrome/browser/chromeos/login/login_browsertest.cc ('k') | chrome/browser/chromeos/offline/offline_load_page.cc » ('j') | chrome/browser/extensions/api/identity/web_auth_flow.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/merge_session_load_page.cc

diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc

index 2a12cbb6ef0b92dd7d761340b545915ae37fdbfc..093b47792cb225107aef8bb25872dd216e5d2e96 100644

--- a/chrome/browser/chromeos/login/merge_session_load_page.cc

+++ b/chrome/browser/chromeos/login/merge_session_load_page.cc

@@ -16,7 +16,6 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"

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

-#include "chrome/browser/extensions/extension_system.h"

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

#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/tab_contents/tab_util.h"

@@ -27,6 +26,7 @@

#include "content/public/browser/interstitial_page.h"

#include "content/public/browser/notification_types.h"

#include "content/public/browser/web_contents.h"

+#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"