chrome/browser/chromeos/display/output_protection_delegate.cc - 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/chromeos/display/output_protection_delegate.cc

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

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

« no previous file with comments | « chrome/browser/chromeos/display/display_configuration_observer.cc ('k') | chrome/browser/chromeos/extensions/wallpaper_private_api_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 2013 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/display/output_protection_delegate.h"	5 #include "chrome/browser/chromeos/display/output_protection_delegate.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/shell.h"

8 #include "ash/shell_delegate.h"

9 #include "build/build_config.h"	8 #include "build/build_config.h"

10 #include "chrome/browser/media/media_capture_devices_dispatcher.h"	9 #include "chrome/browser/media/media_capture_devices_dispatcher.h"

11 #include "content/public/browser/browser_thread.h"	10 #include "content/public/browser/browser_thread.h"

12 #include "content/public/browser/render_frame_host.h"	11 #include "content/public/browser/render_frame_host.h"

13 #include "content/public/browser/web_contents.h"	12 #include "content/public/browser/web_contents.h"

14 #include "ui/display/display.h"	13 #include "ui/display/display.h"

15 #include "ui/display/screen.h"	14 #include "ui/display/screen.h"

16	15

17 namespace chromeos {	16 namespace chromeos {

18	17

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
184 display_id_ = new_display_id;	183 display_id_ = new_display_id;

185 }	184 }

186	185

187 void OutputProtectionDelegate::OnWindowDestroying(aura::Window* window) {	186 void OutputProtectionDelegate::OnWindowDestroying(aura::Window* window) {

188 DCHECK_EQ(window, window_);	187 DCHECK_EQ(window, window_);

189 window_->RemoveObserver(this);	188 window_->RemoveObserver(this);

190 window_ = nullptr;	189 window_ = nullptr;

191 }	190 }

192	191

193 } // namespace chromeos	192 } // namespace chromeos

OLD	NEW