chrome/browser/chromeos/ui/focus_ring_controller.cc - Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types

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: chrome/browser/chromeos/ui/focus_ring_controller.cc

Issue 2099603002: Reland: mash: Convert TrayBackgroundView to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix conflict Created 4 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 unified diff | Download patch

« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | no next file » | 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 "chrome/browser/chromeos/ui/focus_ring_controller.h"	5 #include "chrome/browser/chromeos/ui/focus_ring_controller.h"

6	6

7 #include "ash/common/system/tray/actionable_view.h"	7 #include "ash/common/system/tray/actionable_view.h"

	8 #include "ash/common/system/tray/tray_background_view.h"

8 #include "ash/common/system/tray/tray_popup_header_button.h"	9 #include "ash/common/system/tray/tray_popup_header_button.h"

9 #include "ash/system/tray/tray_background_view.h"

10 #include "ash/wm/window_util.h"	10 #include "ash/wm/window_util.h"

11 #include "chrome/browser/chromeos/ui/focus_ring_layer.h"	11 #include "chrome/browser/chromeos/ui/focus_ring_layer.h"

12 #include "ui/aura/window.h"	12 #include "ui/aura/window.h"

13 #include "ui/views/controls/button/label_button.h"	13 #include "ui/views/controls/button/label_button.h"

14 #include "ui/views/view.h"	14 #include "ui/views/view.h"

15 #include "ui/views/widget/widget.h"	15 #include "ui/views/widget/widget.h"

16	16

17 namespace chromeos {	17 namespace chromeos {

18	18

19 FocusRingController::FocusRingController()	19 FocusRingController::FocusRingController()

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
139 views::View* focused_now) {	139 views::View* focused_now) {

140 }	140 }

141	141

142 void FocusRingController::OnDidChangeFocus(views::View* focused_before,	142 void FocusRingController::OnDidChangeFocus(views::View* focused_before,

143 views::View* focused_now) {	143 views::View* focused_now) {

144 DCHECK_EQ(focused_now, widget_->GetFocusManager()->GetFocusedView());	144 DCHECK_EQ(focused_now, widget_->GetFocusManager()->GetFocusedView());

145 UpdateFocusRing();	145 UpdateFocusRing();

146 }	146 }

147	147

148 } // namespace chromeos	148 } // namespace chromeos

OLD	NEW