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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/dialog_frame_view.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/wm/frame_painter.cc » ('j') | chrome/browser/resources_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dialog_frame_view.cc
diff --git a/ash/wm/dialog_frame_view.cc b/ash/wm/dialog_frame_view.cc
index 31dd6d32bce4a4f351cf157a3da0f1574523d9b0..7eef586cd9a82ca08e84ce2807bcb4f902471908 100644
--- a/ash/wm/dialog_frame_view.cc
+++ b/ash/wm/dialog_frame_view.cc
@@ -4,7 +4,7 @@
#include "ash/wm/dialog_frame_view.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
#include "ui/base/hit_test.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/wm/frame_painter.cc » ('j') | chrome/browser/resources_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698