trunk/src/ash/ash.gyp - Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..."

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: trunk/src/ash/ash.gyp

Issue 260783002: Revert 267158 "CleanUp: Introduce UserInfo. Move session_state s..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 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

« no previous file with comments | « trunk/src/ash/accelerators/nested_dispatcher_controller_unittest.cc ('k') | trunk/src/ash/desktop_background/desktop_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/ash/ash.gyp

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

--- trunk/src/ash/ash.gyp (revision 267249)

+++ trunk/src/ash/ash.gyp (working copy)

@@ -240,10 +240,9 @@

'screen_util.cc',

'screen_util.h',

'screenshot_delegate.h',

- 'session/session_state_delegate.h',

- 'session/session_state_observer.cc',

- 'session/session_state_observer.h',

- 'session/user_info.h',

+ 'session_state_delegate.h',

+ 'session_state_observer.cc',

+ 'session_state_observer.h',

'shelf/app_list_button.cc',

'shelf/app_list_button.h',

'shelf/app_list_shelf_item_delegate.cc',

@@ -941,8 +940,8 @@

'root_window_controller_unittest.cc',

'screen_util_unittest.cc',

'screensaver/screensaver_view_unittest.cc',

- 'session/session_state_delegate_stub.cc',

- 'session/session_state_delegate_stub.h',

+ 'session_state_delegate_stub.cc',

+ 'session_state_delegate_stub.h',

'shelf/scoped_observer_with_duplicated_sources_unittest.cc',

'shelf/shelf_layout_manager_unittest.cc',

'shelf/shelf_model_unittest.cc',

@@ -1137,8 +1136,8 @@

'ash_with_content',

'sources': [

- 'session/session_state_delegate_stub.cc',

- 'session/session_state_delegate_stub.h',

+ 'session_state_delegate_stub.cc',

+ 'session_state_delegate_stub.h',

'shell/app_list.cc',

'shell/bubble.cc',

'shell/content_client/shell_browser_main_parts.cc',