athena/system/system_ui_impl.cc - Issue 558483003: Rename athena/common to athena/util

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: athena/system/system_ui_impl.cc

Issue 558483003: Rename athena/common to athena/util (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: revert unnecessary change Created 6 years, 3 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 "athena/system/public/system_ui.h"	5 #include "athena/system/public/system_ui.h"

6	6

7 #include "athena/common/container_priorities.h"

8 #include "athena/common/fill_layout_manager.h"

9 #include "athena/screen/public/screen_manager.h"	7 #include "athena/screen/public/screen_manager.h"

10 #include "athena/system/background_controller.h"	8 #include "athena/system/background_controller.h"

11 #include "athena/system/device_socket_listener.h"	9 #include "athena/system/device_socket_listener.h"

12 #include "athena/system/orientation_controller.h"	10 #include "athena/system/orientation_controller.h"

13 #include "athena/system/power_button_controller.h"	11 #include "athena/system/power_button_controller.h"

14 #include "athena/system/status_icon_container_view.h"	12 #include "athena/system/status_icon_container_view.h"

15 #include "athena/system/time_view.h"	13 #include "athena/system/time_view.h"

	14 #include "athena/util/container_priorities.h"

	15 #include "athena/util/fill_layout_manager.h"

16 #include "base/logging.h"	16 #include "base/logging.h"

17 #include "base/memory/ref_counted.h"	17 #include "base/memory/ref_counted.h"

18 #include "base/memory/scoped_ptr.h"	18 #include "base/memory/scoped_ptr.h"

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

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

21	21

22 namespace athena {	22 namespace athena {

23 namespace {	23 namespace {

24	24

25 SystemUI* instance = NULL;	25 SystemUI* instance = NULL;

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145	145

146 // static	146 // static

147 void SystemUI::Shutdown() {	147 void SystemUI::Shutdown() {

148 CHECK(instance);	148 CHECK(instance);

149 delete instance;	149 delete instance;

150 instance = NULL;	150 instance = NULL;

151 DeviceSocketListener::ShutdownSocketManager();	151 DeviceSocketListener::ShutdownSocketManager();

152 }	152 }

153	153

154 } // namespace athena	154 } // namespace athena

OLD	NEW

« no previous file with comments | « athena/screen/screen_manager_unittest.cc ('k') | athena/util/DEPS » ('j') | no next file with comments »