ash/common/system/tray/system_tray_controller.cc - Issue 2419723002: Move services/shell to services/service_manager

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/tray/system_tray_controller.cc

Issue 2419723002: Move services/shell to services/service_manager (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/common/mojo_interface_factory.cc ('k') | ash/mus/BUILD.gn » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/common/system/tray/system_tray_controller.h"	5 #include "ash/common/system/tray/system_tray_controller.h"

6	6

7 #include "ash/common/system/tray/system_tray_notifier.h"	7 #include "ash/common/system/tray/system_tray_notifier.h"

8 #include "ash/common/wm_shell.h"	8 #include "ash/common/wm_shell.h"

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/bind_helpers.h"	10 #include "base/bind_helpers.h"

11 #include "services/shell/public/cpp/connector.h"	11 #include "services/service_manager/public/cpp/connector.h"

12	12

13 namespace ash {	13 namespace ash {

14	14

15 SystemTrayController::SystemTrayController(shell::Connector* connector)	15 SystemTrayController::SystemTrayController(shell::Connector* connector)

16 : connector_(connector), hour_clock_type_(base::GetHourClockType()) {}	16 : connector_(connector), hour_clock_type_(base::GetHourClockType()) {}

17	17

18 SystemTrayController::~SystemTrayController() {}	18 SystemTrayController::~SystemTrayController() {}

19	19

20 void SystemTrayController::ShowSettings() {	20 void SystemTrayController::ShowSettings() {

21 if (ConnectToSystemTrayClient())	21 if (ConnectToSystemTrayClient())

(...skipping 102 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 void SystemTrayController::OnClientConnectionError() {	124 void SystemTrayController::OnClientConnectionError() {

125 system_tray_client_.reset();	125 system_tray_client_.reset();

126 }	126 }

127	127

128 void SystemTrayController::SetUse24HourClock(bool use_24_hour) {	128 void SystemTrayController::SetUse24HourClock(bool use_24_hour) {

129 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;	129 hour_clock_type_ = use_24_hour ? base::k24HourClock : base::k12HourClock;

130 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();	130 WmShell::Get()->system_tray_notifier()->NotifyDateFormatChanged();

131 }	131 }

132	132

133 } // namespace ash	133 } // namespace ash

OLD	NEW