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

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase Created 4 years, 2 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
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/shelf/shelf_tooltip_manager.h" 5 #include "ash/common/shelf/shelf_tooltip_manager.h"
6 6
7 #include "ash/common/shelf/shelf_view.h" 7 #include "ash/common/shelf/shelf_view.h"
8 #include "ash/common/shelf/wm_shelf.h" 8 #include "ash/common/shelf/wm_shelf.h"
9 #include "ash/common/shell_window_ids.h"
10 #include "ash/common/system/tray/tray_constants.h" 9 #include "ash/common/system/tray/tray_constants.h"
11 #include "ash/common/wm_lookup.h" 10 #include "ash/common/wm_lookup.h"
12 #include "ash/common/wm_root_window_controller.h" 11 #include "ash/common/wm_root_window_controller.h"
13 #include "ash/common/wm_shell.h" 12 #include "ash/common/wm_shell.h"
14 #include "ash/common/wm_window.h" 13 #include "ash/common/wm_window.h"
14 #include "ash/public/cpp/shell_window_ids.h"
15 #include "base/bind.h" 15 #include "base/bind.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "base/threading/thread_task_runner_handle.h" 17 #include "base/threading/thread_task_runner_handle.h"
18 #include "base/time/time.h" 18 #include "base/time/time.h"
19 #include "ui/base/material_design/material_design_controller.h" 19 #include "ui/base/material_design/material_design_controller.h"
20 #include "ui/events/event.h" 20 #include "ui/events/event.h"
21 #include "ui/events/event_constants.h" 21 #include "ui/events/event_constants.h"
22 #include "ui/gfx/geometry/insets.h" 22 #include "ui/gfx/geometry/insets.h"
23 #include "ui/views/bubble/bubble_dialog_delegate.h" 23 #include "ui/views/bubble/bubble_dialog_delegate.h"
24 #include "ui/views/controls/label.h" 24 #include "ui/views/controls/label.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 259
260 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) { 260 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
261 WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr; 261 WmShelf* shelf = shelf_view_ ? shelf_view_->wm_shelf() : nullptr;
262 return shelf && shelf_view_->ShouldShowTooltipForView(view) && 262 return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
263 (shelf->GetVisibilityState() == SHELF_VISIBLE || 263 (shelf->GetVisibilityState() == SHELF_VISIBLE ||
264 (shelf->GetVisibilityState() == SHELF_AUTO_HIDE && 264 (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
265 shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN)); 265 shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
266 } 266 }
267 267
268 } // namespace ash 268 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_layout_manager.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698