chrome/browser/ui/webui/ntp/ntp_resource_cache.cc - Issue 8992034: Merge 114608, 115692 to 963 (M17) branch.

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/ui/webui/ntp/ntp_resource_cache.cc

Issue 8992034: Merge 114608, 115692 to 963 (M17) branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src/

Patch Set: rebasing, checking for diffs before merge Created 9 years 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/ui/webui/ntp/ntp_resource_cache.cc

diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

index 2c6a1e5d26d1c48c46e0baa879ef8e7e7c828833..b6817a5b0ec5c081c15660cf5be5faa9d11f7f4a 100644

--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

@@ -26,7 +26,7 @@

#include "chrome/browser/ui/webui/ntp/new_tab_page_handler.h"

#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"

#include "chrome/browser/ui/webui/ntp/ntp_login_handler.h"

-#include "chrome/browser/ui/webui/sync_promo_ui.h"

+#include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

#include "chrome/browser/ui/webui/sync_setup_handler.h"

#include "chrome/browser/web_resource/promo_resource_service.h"

#include "chrome/common/chrome_notification_types.h"