ash/common/shelf/shelf_tooltip_manager.cc - Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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_icon_observer.h ('k') | ash/common/shelf/shelf_tooltip_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/wm_shelf.h"	8 #include "ash/common/shelf/wm_shelf.h"

8 #include "ash/common/shell_window_ids.h"	9 #include "ash/common/shell_window_ids.h"

9 #include "ash/common/wm_lookup.h"	10 #include "ash/common/wm_lookup.h"

10 #include "ash/common/wm_root_window_controller.h"	11 #include "ash/common/wm_root_window_controller.h"

11 #include "ash/common/wm_shell.h"	12 #include "ash/common/wm_shell.h"

12 #include "ash/common/wm_window.h"	13 #include "ash/common/wm_window.h"

13 #include "ash/shelf/shelf_view.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/events/event.h"	18 #include "ui/events/event.h"

19 #include "ui/events/event_constants.h"	19 #include "ui/events/event_constants.h"

20 #include "ui/gfx/geometry/insets.h"	20 #include "ui/gfx/geometry/insets.h"

21 #include "ui/views/bubble/bubble_dialog_delegate.h"	21 #include "ui/views/bubble/bubble_dialog_delegate.h"

22 #include "ui/views/controls/label.h"	22 #include "ui/views/controls/label.h"

23 #include "ui/views/layout/fill_layout.h"	23 #include "ui/views/layout/fill_layout.h"

(...skipping 228 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
252 base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));	252 base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));

253 }	253 }

254 }	254 }

255	255

256 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {	256 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {

257 return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&	257 return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&

258 shelf_view_->wm_shelf()->GetVisibilityState() == SHELF_VISIBLE;	258 shelf_view_->wm_shelf()->GetVisibilityState() == SHELF_VISIBLE;

259 }	259 }

260	260

261 } // namespace ash	261 } // namespace ash

OLD	NEW