ash/common/system/chromeos/screen_security/screen_tray_item.cc - Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1"

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/system/chromeos/screen_security/screen_tray_item.cc

Issue 2731873002: Revert "chromeos: Move files in //ash/common to //ash, part 1" (Closed)

Patch Set: Created 3 years, 9 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/system/chromeos/screen_security/screen_tray_item.h ('k') | ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/system/screen_security/screen_tray_item.h"	5 #include "ash/common/system/chromeos/screen_security/screen_tray_item.h"

6	6

7 #include "ash/common/material_design/material_design_controller.h"	7 #include "ash/common/material_design/material_design_controller.h"

8 #include "ash/common/shelf/wm_shelf_util.h"	8 #include "ash/common/shelf/wm_shelf_util.h"

	9 #include "ash/common/system/tray/fixed_sized_image_view.h"

	10 #include "ash/common/system/tray/tray_constants.h"

	11 #include "ash/common/system/tray/tray_popup_item_style.h"

	12 #include "ash/common/system/tray/tray_popup_utils.h"

9 #include "ash/resources/grit/ash_resources.h"	13 #include "ash/resources/grit/ash_resources.h"

10 #include "ash/resources/vector_icons/vector_icons.h"	14 #include "ash/resources/vector_icons/vector_icons.h"

11 #include "ash/system/tray/fixed_sized_image_view.h"

12 #include "ash/system/tray/tray_constants.h"

13 #include "ash/system/tray/tray_popup_item_style.h"

14 #include "ash/system/tray/tray_popup_utils.h"

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

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

17 #include "ui/message_center/message_center.h"	17 #include "ui/message_center/message_center.h"

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

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

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

21	21

22 namespace ash {	22 namespace ash {

23 namespace tray {	23 namespace tray {

24	24

(...skipping 161 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
186	186

187 void ScreenTrayItem::DestroyTrayView() {	187 void ScreenTrayItem::DestroyTrayView() {

188 tray_view_ = nullptr;	188 tray_view_ = nullptr;

189 }	189 }

190	190

191 void ScreenTrayItem::DestroyDefaultView() {	191 void ScreenTrayItem::DestroyDefaultView() {

192 default_view_ = nullptr;	192 default_view_ = nullptr;

193 }	193 }

194	194

195 } // namespace ash	195 } // namespace ash

OLD	NEW