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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/tray_update.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/tray_caps_lock.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | chrome/browser/resources_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_update.cc
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index f98d311cc9ac5f2971b9ff27e6cb0f2a8354249b..82957f09b218c1d83e18aed287afde46db359add 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -13,7 +13,7 @@
#include "base/time.h"
#include "base/timer.h"
#include "grit/ash_strings.h"
-#include "grit/ui_resources_standard.h"
+#include "grit/ui_resources.h"
#include "ui/aura/window.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/layer.h"
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/system/web_notification/web_notification_tray.cc » ('j') | chrome/browser/resources_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698