chrome/browser/ui/aura/active_desktop_monitor.cc - Issue 174803002: Move root_window.* to window_event_dispatcher.*

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/aura/active_desktop_monitor.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 10 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

« no previous file with comments | « chrome/browser/ui/ash/window_positioner_unittest.cc ('k') | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »

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 #include "chrome/browser/ui/aura/active_desktop_monitor.h"	5 #include "chrome/browser/ui/aura/active_desktop_monitor.h"

6	6

7 #include "ui/aura/env.h"	7 #include "ui/aura/env.h"

8 #include "ui/aura/root_window.h"	8 #include "ui/aura/window_event_dispatcher.h"

9	9

10 #if defined(USE_X11)	10 #if defined(USE_X11)

11 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"	11 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"

12 #elif defined(OS_WIN)	12 #elif defined(OS_WIN)

13 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"	13 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"

14 #endif	14 #endif

15	15

16 // static	16 // static

17 ActiveDesktopMonitor* ActiveDesktopMonitor::g_instance_ = NULL;	17 ActiveDesktopMonitor* ActiveDesktopMonitor::g_instance_ = NULL;

18	18

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
60 void ActiveDesktopMonitor::OnRootWindowActivated(	60 void ActiveDesktopMonitor::OnRootWindowActivated(

61 aura::WindowEventDispatcher* dispatcher) {	61 aura::WindowEventDispatcher* dispatcher) {

62 if (IsDesktopWindow(dispatcher))	62 if (IsDesktopWindow(dispatcher))

63 last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_NATIVE;	63 last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_NATIVE;

64 else	64 else

65 last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_ASH;	65 last_activated_desktop_ = chrome::HOST_DESKTOP_TYPE_ASH;

66 DVLOG(1) << __FUNCTION__	66 DVLOG(1) << __FUNCTION__

67 << (last_activated_desktop_ == chrome::HOST_DESKTOP_TYPE_NATIVE ?	67 << (last_activated_desktop_ == chrome::HOST_DESKTOP_TYPE_NATIVE ?

68 " native" : " ash") << " desktop activated.";	68 " native" : " ash") << " desktop activated.";

69 }	69 }

OLD	NEW