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

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 "chrome/browser/chromeos/ui/kiosk_external_update_notification.h"	5 #include "chrome/browser/chromeos/ui/kiosk_external_update_notification.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 "base/macros.h"	9 #include "base/macros.h"

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

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

12 #include "ui/compositor/layer.h"	12 #include "ui/compositor/layer.h"

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

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

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

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

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

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
148	148

149 void KioskExternalUpdateNotification::Dismiss() {	149 void KioskExternalUpdateNotification::Dismiss() {

150 if (view_) {	150 if (view_) {

151 KioskExternalUpdateNotificationView* view = view_;	151 KioskExternalUpdateNotificationView* view = view_;

152 view_ = NULL;	152 view_ = NULL;

153 view->CloseByOwner();	153 view->CloseByOwner();

154 }	154 }

155 }	155 }

156	156

157 } // namespace chromeos	157 } // namespace chromeos

OLD	NEW