chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_...""

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/ui/ash/system_tray_delegate_chromeos.cc

Issue 126213002: Revert "Revert 239730 "ash_system_tray_delegate -> system_tray_delegate_..."" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2012 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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"	5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <set>	8 #include <set>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "ash/ash_switches.h"	12 #include "ash/ash_switches.h"

13 #include "ash/desktop_background/desktop_background_controller.h"	13 #include "ash/desktop_background/desktop_background_controller.h"

14 #include "ash/metrics/user_metrics_recorder.h"	14 #include "ash/metrics/user_metrics_recorder.h"

15 #include "ash/session_state_delegate.h"	15 #include "ash/session_state_delegate.h"

(...skipping 1270 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1286 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);	1286 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);

1287 };	1287 };

1288	1288

1289 } // namespace	1289 } // namespace

1290	1290

1291 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {	1291 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {

1292 return new chromeos::SystemTrayDelegate();	1292 return new chromeos::SystemTrayDelegate();

1293 }	1293 }

1294	1294

1295 } // namespace chromeos	1295 } // namespace chromeos

OLD	NEW

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »