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

Unified Diff: ash/wm/common/workspace/multi_window_resize_controller.cc

Issue 2026973002: Moves ash/wm/common/resources back to ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete revived file Created 4 years, 7 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
Index: ash/wm/common/workspace/multi_window_resize_controller.cc
diff --git a/ash/wm/common/workspace/multi_window_resize_controller.cc b/ash/wm/common/workspace/multi_window_resize_controller.cc
index cf716446076a4bfae95673aedc8294f8c0dfe78e..69661bc926f927a1e04096cce1be7f312f079d39 100644
--- a/ash/wm/common/workspace/multi_window_resize_controller.cc
+++ b/ash/wm/common/workspace/multi_window_resize_controller.cc
@@ -9,7 +9,7 @@
#include "ash/wm/common/wm_shell_window_ids.h"
#include "ash/wm/common/wm_window.h"
#include "ash/wm/common/workspace/workspace_window_resizer.h"
-#include "grit/ash_wm_common_resources.h"
+#include "grit/ash_resources.h"
#include "ui/base/cursor/cursor.h"
#include "ui/base/hit_test.h"
#include "ui/base/resource/resource_bundle.h"
@@ -67,9 +67,8 @@ class MultiWindowResizeController::ResizeView : public views::View {
Direction direction)
: controller_(controller), direction_(direction), image_(NULL) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- int image_id = direction == TOP_BOTTOM
- ? IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_H
- : IDR_ASH_WM_COMMON_MULTI_WINDOW_RESIZE_V;
+ int image_id = direction == TOP_BOTTOM ? IDR_AURA_MULTI_WINDOW_RESIZE_H
+ : IDR_AURA_MULTI_WINDOW_RESIZE_V;
image_ = rb.GetImageNamed(image_id).ToImageSkia();
}

Powered by Google App Engine
This is Rietveld 408576698