ash/shelf/shelf_widget.cc - Issue 2026973002: Moves ash/wm/common/resources back to ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/shelf/shelf_widget.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:

Index: ash/shelf/shelf_widget.cc

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc

index fa78f696d4483dc6a7701e87b3fe970abcf74430..a454bd3d10d19c95f4ac3baebd4b89d3927d2e3f 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

@@ -26,7 +26,6 @@

#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"

@@ -453,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_WM_COMMON_SHELF_BACKGROUND);

+ *rb->GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);

const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());

if (!horizontal) {

shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(