ash/aura/scoped_root_window_for_new_windows_aura.cc - Issue 2194353002: mash: Migrate ScopedTargetRootWindow 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: ash/aura/scoped_root_window_for_new_windows_aura.cc

Issue 2194353002: mash: Migrate ScopedTargetRootWindow to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: similarity 40 Created 4 years, 4 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/aura/scoped_root_window_for_new_windows_aura.h ('K') | « ash/aura/scoped_root_window_for_new_windows_aura.h ('k') | ash/aura/wm_shell_aura.h » ('j') | ash/common/scoped_root_window_for_new_windows.h » ('J')
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 #include "ash/scoped_target_root_window.h"	4

	5 #include "ash/aura/scoped_root_window_for_new_windows_aura.h"

5	6

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

7	8

8 namespace ash {	9 namespace ash {

9	10

10 ScopedTargetRootWindow::ScopedTargetRootWindow(aura::Window* root_window) {	11 ScopedRootWindowForNewWindowsAura::ScopedRootWindowForNewWindowsAura(

	12 aura::Window* root_window) {

11 Shell::GetInstance()->scoped_target_root_window_ = root_window;	13 Shell::GetInstance()->scoped_target_root_window_ = root_window;
	msw 2016/08/01 21:36:14 q: [D]CHECK that scoped_target_root_window_ is nul q: [D]CHECK that scoped_target_root_window_ is null?
12 }	14 }

13	15

14 ScopedTargetRootWindow::~ScopedTargetRootWindow() {	16 ScopedRootWindowForNewWindowsAura::~ScopedRootWindowForNewWindowsAura() {

15 Shell::GetInstance()->scoped_target_root_window_ = NULL;	17 Shell::GetInstance()->scoped_target_root_window_ = nullptr;
	msw 2016/08/01 21:36:15 q: [D]CHECK that the existing value was set by thi q: [D]CHECK that the existing value was set by this instance?
16 }	18 }

17	19

18 } // namespace ash	20 } // namespace ash

OLD	NEW