ash/sticky_keys/sticky_keys_overlay.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

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/sticky_keys/sticky_keys_overlay.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/shell_unittest.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/sticky_keys/sticky_keys_overlay.h"	5 #include "ash/sticky_keys/sticky_keys_overlay.h"

6	6

7 #include "ash/common/shell_window_ids.h"	7 #include "ash/public/cpp/shell_window_ids.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ash/sticky_keys/sticky_keys_controller.h"	9 #include "ash/sticky_keys/sticky_keys_controller.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "grit/ash_strings.h"	12 #include "grit/ash_strings.h"

13 #include "ui/base/l10n/l10n_util.h"	13 #include "ui/base/l10n/l10n_util.h"

14 #include "ui/base/resource/resource_bundle.h"	14 #include "ui/base/resource/resource_bundle.h"

15 #include "ui/compositor/scoped_layer_animation_settings.h"	15 #include "ui/compositor/scoped_layer_animation_settings.h"

16 #include "ui/gfx/canvas.h"	16 #include "ui/gfx/canvas.h"

17 #include "ui/gfx/font_list.h"	17 #include "ui/gfx/font_list.h"

(...skipping 288 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
306 ui::LayerAnimationSequence* sequence) {	306 ui::LayerAnimationSequence* sequence) {

307 ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();	307 ui::LayerAnimator* animator = overlay_widget_->GetLayer()->GetAnimator();

308 if (animator)	308 if (animator)

309 animator->RemoveObserver(this);	309 animator->RemoveObserver(this);

310 }	310 }

311	311

312 void StickyKeysOverlay::OnLayerAnimationScheduled(	312 void StickyKeysOverlay::OnLayerAnimationScheduled(

313 ui::LayerAnimationSequence* sequence) {}	313 ui::LayerAnimationSequence* sequence) {}

314	314

315 } // namespace ash	315 } // namespace ash

OLD	NEW