chrome/browser/chromeos/shutdown_policy_browsertest.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //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: chrome/browser/chromeos/shutdown_policy_browsertest.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase 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 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 <memory>	5 #include <memory>

6 #include <string>	6 #include <string>

7	7

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

9 #include "ash/common/system/date/date_default_view.h"	9 #include "ash/common/system/date/date_default_view.h"

10 #include "ash/common/system/date/tray_date.h"	10 #include "ash/common/system/date/tray_date.h"

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

11 #include "ash/common/system/tray/tray_popup_header_button.h"	12 #include "ash/common/system/tray/tray_popup_header_button.h"

12 #include "ash/shell.h"	13 #include "ash/shell.h"

13 #include "ash/strings/grit/ash_strings.h"	14 #include "ash/strings/grit/ash_strings.h"

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

15 #include "base/command_line.h"	15 #include "base/command_line.h"

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

17 #include "base/macros.h"	17 #include "base/macros.h"

18 #include "base/run_loop.h"	18 #include "base/run_loop.h"

19 #include "base/single_thread_task_runner.h"	19 #include "base/single_thread_task_runner.h"

20 #include "base/strings/stringprintf.h"	20 #include "base/strings/stringprintf.h"

21 #include "base/threading/thread_task_runner_handle.h"	21 #include "base/threading/thread_task_runner_handle.h"

22 #include "chrome/browser/chrome_notification_types.h"	22 #include "chrome/browser/chrome_notification_types.h"

23 #include "chrome/browser/chromeos/login/lock/screen_locker.h"	23 #include "chrome/browser/chromeos/login/lock/screen_locker.h"

24 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"	24 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"

(...skipping 302 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
327 PrepareAndRunScript("restart-header-bar-item", false);	327 PrepareAndRunScript("restart-header-bar-item", false);

328 PrepareAndRunScript("shutdown-header-bar-item", true);	328 PrepareAndRunScript("shutdown-header-bar-item", true);

329	329

330 UpdateRebootOnShutdownPolicy(false);	330 UpdateRebootOnShutdownPolicy(false);

331 RefreshDevicePolicy();	331 RefreshDevicePolicy();

332 PrepareAndRunScript("restart-header-bar-item", true);	332 PrepareAndRunScript("restart-header-bar-item", true);

333 PrepareAndRunScript("shutdown-header-bar-item", false);	333 PrepareAndRunScript("shutdown-header-bar-item", false);

334 }	334 }

335	335

336 } // namespace chromeos	336 } // namespace chromeos

OLD	NEW