chrome/browser/chromeos/login/merge_session_load_page.cc - Issue 225043002: Move extension_icon_set.{h,cc} to //extensions

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 225043002: Move extension_icon_set.{h,cc} to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

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 993242f890621a9154a9aa7c0c6bae508775b7a6..eb56503011db8e9eeaffa20a79c08a27c26594e8 100644

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

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

@@ -20,7 +20,6 @@

#include "chrome/browser/renderer_preferences_util.h"

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

#include "chrome/common/extensions/extension_constants.h"

-#include "chrome/common/extensions/extension_icon_set.h"

#include "chrome/common/url_constants.h"

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

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

@@ -28,6 +27,7 @@

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

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

+#include "extensions/common/extension_icon_set.h"

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"

#include "net/base/escape.h"