ash/system/web_notification/web_notification_tray.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: ash/system/web_notification/web_notification_tray.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: ash/system/web_notification/web_notification_tray.cc

diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc

index 25a4f8f2beac70af51b5f176e3d3aadd84bd8a6c..bce9b2e2bba95b295d749ade53dd256dd1d9394b 100644

--- a/ash/system/web_notification/web_notification_tray.cc

+++ b/ash/system/web_notification/web_notification_tray.cc

@@ -12,7 +12,6 @@

#include "base/message_loop.h"

#include "grit/ash_strings.h"

#include "grit/ui_resources.h"

-#include "grit/ui_resources_standard.h"

#include "ui/aura/window.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/simple_menu_model.h"

« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/wm/dialog_frame_view.cc » ('j') | no next file with comments »