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

Side by Side Diff: ash/shelf/shelf_tooltip_manager.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_tooltip_manager.h" 5 #include "ash/shelf/shelf_tooltip_manager.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_view.h" 9 #include "ash/shelf/shelf_view.h"
10 #include "ash/shelf/wm_shelf.h" 10 #include "ash/shelf/wm_shelf.h"
11 #include "ash/shell_port.h"
11 #include "ash/system/tray/tray_constants.h" 12 #include "ash/system/tray/tray_constants.h"
12 #include "ash/wm_shell.h"
13 #include "ash/wm_window.h" 13 #include "ash/wm_window.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "ui/base/material_design/material_design_controller.h" 18 #include "ui/base/material_design/material_design_controller.h"
19 #include "ui/events/event.h" 19 #include "ui/events/event.h"
20 #include "ui/events/event_constants.h" 20 #include "ui/events/event_constants.h"
21 #include "ui/gfx/geometry/insets.h" 21 #include "ui/gfx/geometry/insets.h"
22 #include "ui/views/bubble/bubble_dialog_delegate.h" 22 #include "ui/views/bubble/bubble_dialog_delegate.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble); 119 DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
120 }; 120 };
121 121
122 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view) 122 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
123 : timer_delay_(kTooltipAppearanceDelay), 123 : timer_delay_(kTooltipAppearanceDelay),
124 shelf_view_(shelf_view), 124 shelf_view_(shelf_view),
125 bubble_(nullptr), 125 bubble_(nullptr),
126 weak_factory_(this) { 126 weak_factory_(this) {
127 shelf_view_->wm_shelf()->AddObserver(this); 127 shelf_view_->wm_shelf()->AddObserver(this);
128 WmShell::Get()->AddPointerWatcher(this, 128 ShellPort::Get()->AddPointerWatcher(this,
129 views::PointerWatcherEventTypes::BASIC); 129 views::PointerWatcherEventTypes::BASIC);
130 } 130 }
131 131
132 ShelfTooltipManager::~ShelfTooltipManager() { 132 ShelfTooltipManager::~ShelfTooltipManager() {
133 WmShell::Get()->RemovePointerWatcher(this); 133 ShellPort::Get()->RemovePointerWatcher(this);
134 shelf_view_->wm_shelf()->RemoveObserver(this); 134 shelf_view_->wm_shelf()->RemoveObserver(this);
135 WmWindow* window = nullptr; 135 WmWindow* window = nullptr;
136 if (shelf_view_->GetWidget()) 136 if (shelf_view_->GetWidget())
137 window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow()); 137 window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
138 if (window) 138 if (window)
139 window->RemoveLimitedPreTargetHandler(this); 139 window->RemoveLimitedPreTargetHandler(this);
140 } 140 }
141 141
142 void ShelfTooltipManager::Init() { 142 void ShelfTooltipManager::Init() {
143 WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow()); 143 WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 254
255 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) { 255 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
256 WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr; 256 WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr;
257 return shelf && shelf_view_->ShouldShowTooltipForView(view) && 257 return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
258 (shelf->GetVisibilityState() == SHELF_VISIBLE || 258 (shelf->GetVisibilityState() == SHELF_VISIBLE ||
259 (shelf->GetVisibilityState() == SHELF_AUTO_HIDE && 259 (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
260 shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN)); 260 shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
261 } 261 }
262 262
263 } // namespace ash 263 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698