Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: chrome/browser/ui/media_stream_infobar_delegate.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/libgtk2ui/libgtk2ui.gyp ('k') | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/media_stream_infobar_delegate.cc
diff --git a/chrome/browser/ui/media_stream_infobar_delegate.cc b/chrome/browser/ui/media_stream_infobar_delegate.cc
index 3668a38b7e6844e63b430636a76c360177ad5c11..da9b3424d7fcecd36ce6608886eb4f9618c5fe6c 100644
--- a/chrome/browser/ui/media_stream_infobar_delegate.cc
+++ b/chrome/browser/ui/media_stream_infobar_delegate.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "googleurl/src/gurl.h"
-#include "grit/theme_resources_standard.h"
+#include "grit/theme_resources.h"
#include "ui/base/resource/resource_bundle.h"
MediaStreamInfoBarDelegate::MediaStreamInfoBarDelegate(
« no previous file with comments | « chrome/browser/ui/libgtk2ui/libgtk2ui.gyp ('k') | chrome/browser/ui/panels/panel_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698