chrome/browser/ui/ash/chrome_shell_delegate.h - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

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/chrome_shell_delegate.h

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup. 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

« ash/system/user/tray_user_unittest.cc ('K') | « chrome/browser/sync/sync_error_notifier_ash.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	5 #ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	6 #define CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

7	7

8 #include <memory>	8 #include <memory>

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

10	10

11 #include "ash/shell_delegate.h"	11 #include "ash/common/shell_delegate.h"

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

13 #include "base/observer_list.h"	13 #include "base/observer_list.h"

14 #include "build/build_config.h"	14 #include "build/build_config.h"

15 #include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h"	15 #include "chrome/browser/ui/ash/metrics/chrome_user_metrics_recorder.h"

16 #include "content/public/browser/notification_observer.h"	16 #include "content/public/browser/notification_observer.h"

17 #include "content/public/browser/notification_registrar.h"	17 #include "content/public/browser/notification_registrar.h"

18	18

19 namespace chromeos {	19 namespace chromeos {

20 class DisplayConfigurationObserver;	20 class DisplayConfigurationObserver;

21 }	21 }

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 // Proxies events from chrome/browser to ash::UserMetricsRecorder.	86 // Proxies events from chrome/browser to ash::UserMetricsRecorder.

87 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;	87 std::unique_ptr<ChromeUserMetricsRecorder> chrome_user_metrics_recorder_;

88	88

89 std::unique_ptr<chromeos::DisplayConfigurationObserver>	89 std::unique_ptr<chromeos::DisplayConfigurationObserver>

90 display_configuration_observer_;	90 display_configuration_observer_;

91	91

92 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);	92 DISALLOW_COPY_AND_ASSIGN(ChromeShellDelegate);

93 };	93 };

94	94

95 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_	95 #endif // CHROME_BROWSER_UI_ASH_CHROME_SHELL_DELEGATE_H_

OLD	NEW