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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 1994993003: Moves resources used by ash/wm/common to ash/wm/common/resources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: repack chrome 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
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/shelf_background.png ('k') | ash/wm/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 7ac803a2613ae155789bffe0ba4265db195a16a3..216b0901d32855775fe45832886cfcc803346162 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -25,6 +25,7 @@
#include "ash/wm/window_properties.h"
#include "ash/wm/workspace_controller.h"
#include "grit/ash_resources.h"
+#include "grit/ash_wm_common_resources.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/aura/window_observer.h"
@@ -451,7 +452,7 @@ void ShelfWidget::DelegateView::SetParentLayer(ui::Layer* layer) {
void ShelfWidget::DelegateView::OnPaintBackground(gfx::Canvas* canvas) {
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
gfx::ImageSkia shelf_background =
- *rb->GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
+ *rb->GetImageSkiaNamed(IDR_ASH_WM_COMMON_SHELF_BACKGROUND);
oshima 2016/05/19 22:48:55 It sounds a bit weird to have "shelf_background" i
sky 2016/05/19 22:56:59 DockedWindowLayoutManager uses it: https://coderev
const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
if (!horizontal) {
shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(
« no previous file with comments | « ash/resources/default_200_percent/common/shelf/shelf_background.png ('k') | ash/wm/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698