ash/system/bluetooth/tray_bluetooth.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/bluetooth/tray_bluetooth.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: merge 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/bluetooth/tray_bluetooth.cc

diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc

index 8a6551d7312e35b55018fb5e4683416df315b4c4..43b707f9f11ad013c2957dfc1488e96737902577 100644

--- a/ash/system/bluetooth/tray_bluetooth.cc

+++ b/ash/system/bluetooth/tray_bluetooth.cc

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

#include "ash/system/tray/tray_item_more.h"

#include "ash/system/tray/tray_views.h"

#include "grit/ash_strings.h"

-#include "grit/ui_resources_standard.h"

+#include "grit/ui_resources.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/image/image.h"

#include "ui/views/controls/image_view.h"