ash/display/display_controller.h - Issue 14807002: Revert 197501 "Merge 195552 "Restore focus/activation after the ..."

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

Unified Diff: ash/display/display_controller.h

Issue 14807002: Revert 197501 "Merge 195552 "Restore focus/activation after the ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1453/src/

Patch Set: Created 7 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: ash/display/display_controller.h

===================================================================

--- ash/display/display_controller.h (revision 197747)

+++ ash/display/display_controller.h (working copy)

@@ -31,7 +31,6 @@

namespace ash {

namespace internal {

class DisplayManager;

-class FocusActivationStore;

class RootWindowController;

}

@@ -259,8 +258,6 @@

// display.

aura::RootWindow* primary_root_window_for_replace_;

- scoped_ptr<internal::FocusActivationStore> focus_activation_store_;

DISALLOW_COPY_AND_ASSIGN(DisplayController);

};

Property changes on: ash/display/display_controller.h

___________________________________________________________________

Deleted: svn:mergeinfo

« no previous file with comments | « no previous file | ash/display/display_controller.cc » ('j') | no next file with comments »