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

Unified Diff: ash/system/tray/system_tray_bubble.cc

Issue 2961313003: Touch gestures for System Tray/ IME/ Stylus/ Notifications (Closed)
Patch Set: Fixed nits. Created 3 years, 5 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/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray_bubble.cc
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index a9036cd1f38f54ae8da0b00ec2e810c5197663a7..bd6393915b5e3ab46662fad1acb509894826eb47 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -15,7 +15,6 @@
#include "ash/system/tray/system_tray_item.h"
#include "ash/system/tray/tray_bubble_wrapper.h"
#include "ash/system/tray/tray_constants.h"
-#include "ash/wm/maximize_mode/maximize_mode_controller.h"
#include "base/metrics/histogram_macros.h"
#include "base/threading/thread_task_runner_handle.h"
#include "ui/compositor/layer.h"
@@ -69,26 +68,6 @@ class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver {
} // namespace
-// CloseBubbleObserver is used to delay closing the system tray bubble until the
-// animation completes.
-class CloseBubbleObserver : public ui::ImplicitAnimationObserver {
- public:
- explicit CloseBubbleObserver(SystemTrayBubble* system_tray_bubble)
- : system_tray_bubble_(system_tray_bubble) {}
-
- ~CloseBubbleObserver() override {}
-
- void OnImplicitAnimationsCompleted() override {
- system_tray_bubble_->Close();
- delete this;
- }
-
- private:
- SystemTrayBubble* system_tray_bubble_ = nullptr;
-
- DISALLOW_COPY_AND_ASSIGN(CloseBubbleObserver);
-};
-
// SystemTrayBubble
SystemTrayBubble::SystemTrayBubble(
@@ -221,27 +200,8 @@ void SystemTrayBubble::InitView(views::View* anchor,
}
init_params->delegate = tray_;
- // Place the bubble on same display as this system tray if it is not on
- // maximize mode. Otherwise, create an clipping window to hold the system
- // bubble. And place the clipping window on the same display as the system
- // tray.
- if (Shell::Get()
- ->maximize_mode_controller()
- ->IsMaximizeModeWindowManagerEnabled()) {
- if (!clipping_window_.get()) {
- clipping_window_ =
- std::unique_ptr<aura::Window>(new aura::Window(nullptr));
- clipping_window_->Init(ui::LAYER_NOT_DRAWN);
- clipping_window_->layer()->SetMasksToBounds(true);
- tray_->GetBubbleWindowContainer()->AddChild(clipping_window_.get());
- clipping_window_->Show();
- }
- clipping_window_->SetBounds(tray_->GetWorkAreaBoundsInScreen());
- init_params->parent_window = clipping_window_.get();
- } else {
- init_params->parent_window = tray_->GetBubbleWindowContainer();
- }
-
+ // Place the bubble on same display as this system tray.
+ init_params->parent_window = tray_->GetBubbleWindowContainer();
init_params->anchor_view = anchor;
bubble_view_ = new TrayBubbleView(*init_params);
UpdateBottomPadding();
@@ -330,22 +290,6 @@ void SystemTrayBubble::RecordVisibleRowMetrics() {
}
}
-void SystemTrayBubble::AnimateToTargetBounds(const gfx::Rect& target_bounds,
- bool close_bubble) {
- const int kAnimationDurationMS = 200;
-
- ui::ScopedLayerAnimationSettings settings(
- bubble_view()->GetWidget()->GetNativeView()->layer()->GetAnimator());
- settings.SetTransitionDuration(
- base::TimeDelta::FromMilliseconds(kAnimationDurationMS));
- settings.SetTweenType(gfx::Tween::EASE_OUT);
- settings.SetPreemptionStrategy(
- ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
- if (close_bubble)
- settings.AddObserver(new CloseBubbleObserver(this));
- bubble_view()->GetWidget()->SetBounds(target_bounds);
-}
-
void SystemTrayBubble::UpdateBottomPadding() {
if (bubble_type_ == BUBBLE_TYPE_DEFAULT)
bubble_view_->SetBottomPadding(kDefaultViewBottomPadding);
« no previous file with comments | « ash/system/tray/system_tray_bubble.h ('k') | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698