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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 1929023002: Refactors WindowResizers to use ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move forward declaration Created 4 years, 8 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/shelf/shelf_util.cc ('k') | ash/shell_window_ids.h » ('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 2bb1015ffa30f8f855b2d12954f341e6a07bb279..7ac803a2613ae155789bffe0ba4265db195a16a3 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -20,6 +20,7 @@
#include "ash/shell_window_ids.h"
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/wm/common/shelf/wm_shelf_constants.h"
+#include "ash/wm/common/shelf/wm_shelf_util.h"
#include "ash/wm/status_area_layout_manager.h"
#include "ash/wm/window_properties.h"
#include "ash/wm/workspace_controller.h"
@@ -181,7 +182,7 @@ void DimmerView::OnPaintBackground(gfx::Canvas* canvas) {
gfx::ImageSkia shelf_background =
*rb->GetImageNamed(IDR_ASH_SHELF_DIMMING).ToImageSkia();
- if (!IsHorizontalAlignment(shelf_->GetAlignment())) {
+ if (!wm::IsHorizontalAlignment(shelf_->GetAlignment())) {
shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(
shelf_background, shelf_->GetAlignment() == wm::SHELF_ALIGNMENT_LEFT
? SkBitmapOperations::ROTATION_90_CW
@@ -451,7 +452,7 @@ void ShelfWidget::DelegateView::OnPaintBackground(gfx::Canvas* canvas) {
ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
gfx::ImageSkia shelf_background =
*rb->GetImageSkiaNamed(IDR_ASH_SHELF_BACKGROUND);
- const bool horizontal = IsHorizontalAlignment(shelf_->GetAlignment());
+ const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
if (!horizontal) {
shelf_background = gfx::ImageSkiaOperations::CreateRotatedImage(
shelf_background, shelf_->GetAlignment() == wm::SHELF_ALIGNMENT_LEFT
« no previous file with comments | « ash/shelf/shelf_util.cc ('k') | ash/shell_window_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698