ash/system/chromeos/multi_user/user_switch_util.cc - Issue 2109613005: mash: Move system tray cast code into //ash/common

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/system/chromeos/multi_user/user_switch_util.cc

Issue 2109613005: mash: Move system tray cast code into //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: forward decl 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

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/system/chromeos/multi_user/user_switch_util.h"	5 #include "ash/system/chromeos/multi_user/user_switch_util.h"

6	6

	7 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"

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

8 #include "ash/system/chromeos/screen_security/screen_tray_item.h"

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

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

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

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

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

14 #include "ui/views/layout/grid_layout.h"	14 #include "ui/views/layout/grid_layout.h"

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

16 #include "ui/views/window/dialog_delegate.h"	16 #include "ui/views/window/dialog_delegate.h"

17	17

18 namespace ash {	18 namespace ash {

(...skipping 169 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
188 if (!instance_for_test)	188 if (!instance_for_test)

189 return false;	189 return false;

190 if (accept)	190 if (accept)

191 instance_for_test->Accept();	191 instance_for_test->Accept();

192 delete instance_for_test->GetWidget()->GetNativeWindow();	192 delete instance_for_test->GetWidget()->GetNativeWindow();

193 CHECK(!instance_for_test);	193 CHECK(!instance_for_test);

194 return true;	194 return true;

195 }	195 }

196	196

197 } // namespace chromeos	197 } // namespace chromeos

OLD	NEW

« no previous file with comments | « ash/system/cast/tray_cast.cc ('k') | ash/system/chromeos/multi_user/user_switch_util_unittest.cc » ('j') | no next file with comments »