Commit 2ecb998d authored by Antonio Gomes's avatar Antonio Gomes Committed by Commit Bot

Adopt chromeos::TabletState in ash/.../caption_buttons

BUG=1113900
R=jamescook@chromium.org

Change-Id: I2f6f52bafa59f3c93a47b77c8429b9c0e25ac076
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2446204
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813832}
parent 7a8fab11
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "ash/public/cpp/caption_buttons/caption_button_model.h" #include "ash/public/cpp/caption_buttons/caption_button_model.h"
#include "ash/public/cpp/caption_buttons/frame_size_button.h" #include "ash/public/cpp/caption_buttons/frame_size_button.h"
#include "ash/public/cpp/caption_buttons/snap_controller.h" #include "ash/public/cpp/caption_buttons/snap_controller.h"
#include "ash/public/cpp/tablet_mode.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics.h"
#include "base/numerics/ranges.h" #include "base/numerics/ranges.h"
#include "chromeos/ui/tablet_state.h"
#include "ui/aura/window_tree_host.h" #include "ui/aura/window_tree_host.h"
#include "ui/base/hit_test.h" #include "ui/base/hit_test.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
...@@ -420,7 +420,7 @@ void FrameCaptionButtonContainerView::ButtonPressed(views::Button* sender, ...@@ -420,7 +420,7 @@ void FrameCaptionButtonContainerView::ButtonPressed(views::Button* sender,
} }
} else if (sender == close_button_) { } else if (sender == close_button_) {
frame_->Close(); frame_->Close();
if (TabletMode::Get()->InTabletMode()) if (chromeos::TabletState::Get()->InTabletMode())
RecordAction(UserMetricsAction("Tablet_WindowCloseFromCaptionButton")); RecordAction(UserMetricsAction("Tablet_WindowCloseFromCaptionButton"));
else else
RecordAction(UserMetricsAction("CloseButton_Clk")); RecordAction(UserMetricsAction("CloseButton_Clk"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment