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

Unified Diff: ash/system/tray/system_tray.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/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index d77b65a412fbcadce670f8104fd3113cb916dd16..5e65db2e9e1ba76a5f68b44801016b6394911c68 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -25,6 +25,7 @@
#include "ash/system/user/tray_user.h"
#include "ash/system/user/tray_user_separator.h"
#include "ash/system/web_notification/web_notification_tray.h"
+#include "ash/wm/common/shelf/wm_shelf_util.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "base/timer/timer.h"
@@ -317,7 +318,7 @@ void SystemTray::UpdateAfterLoginStatusChange(user::LoginStatus login_status) {
// Items default to SHELF_ALIGNMENT_BOTTOM. Update them if the initial
// position of the shelf differs.
- if (!IsHorizontalAlignment(shelf_alignment()))
+ if (!wm::IsHorizontalAlignment(shelf_alignment()))
UpdateAfterShelfAlignmentChange(shelf_alignment());
SetVisible(true);
@@ -417,7 +418,7 @@ base::string16 SystemTray::GetAccessibleNameForTray() {
int SystemTray::GetTrayXOffset(SystemTrayItem* item) const {
// Don't attempt to align the arrow if the shelf is on the left or right.
- if (!IsHorizontalAlignment(shelf_alignment()))
+ if (!wm::IsHorizontalAlignment(shelf_alignment()))
return TrayBubbleView::InitParams::kArrowDefaultOffset;
std::map<SystemTrayItem*, views::View*>::const_iterator it =
@@ -711,7 +712,7 @@ bool SystemTray::PerformAction(const ui::Event& event) {
if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
const ui::LocatedEvent& located_event =
static_cast<const ui::LocatedEvent&>(event);
- if (IsHorizontalAlignment(shelf_alignment())) {
+ if (wm::IsHorizontalAlignment(shelf_alignment())) {
gfx::Point point(located_event.x(), 0);
ConvertPointToWidget(this, &point);
arrow_offset = point.x();
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698