chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/views/ash/launcher/chrome_launcher_controller.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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/ui/views/ash/launcher/chrome_launcher_controller.cc

diff --git a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

index 4e3e34cd8c5142ce1776289e9db0f260b7d373ef..53822a7e0ee545d6fc69a7990574a08facbb3392 100644

--- a/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

+++ b/chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.cc

@@ -40,7 +40,7 @@

#include "chrome/common/pref_names.h"

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

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

-#include "grit/theme_resources_standard.h"

+#include "grit/theme_resources.h"

#include "ui/aura/client/activation_client.h"

#include "ui/aura/window.h"

#include "ui/views/widget/widget.h"