ash/shelf/shelf_layout_manager.h - Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session.

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/shelf/shelf_layout_manager.h

Issue 253063002: CleanUp: Introduce UserInfo. Move session_state stuff to ash/session. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix tests Created 6 years, 7 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 | « ash/session_state_observer.cc ('k') | ash/shelf/shelf_layout_manager.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 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_	5 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_

6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_	6 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

10 #include "ash/ash_export.h"	10 #include "ash/ash_export.h"

11 #include "ash/session_state_observer.h"	11 #include "ash/session/session_state_observer.h"

12 #include "ash/shelf/background_animator.h"	12 #include "ash/shelf/background_animator.h"

13 #include "ash/shelf/shelf.h"	13 #include "ash/shelf/shelf.h"

14 #include "ash/shelf/shelf_types.h"	14 #include "ash/shelf/shelf_types.h"

15 #include "ash/shell_observer.h"	15 #include "ash/shell_observer.h"

16 #include "ash/system/status_area_widget.h"	16 #include "ash/system/status_area_widget.h"

17 #include "ash/wm/dock/docked_window_layout_manager_observer.h"	17 #include "ash/wm/dock/docked_window_layout_manager_observer.h"

18 #include "ash/wm/lock_state_observer.h"	18 #include "ash/wm/lock_state_observer.h"

19 #include "ash/wm/workspace/workspace_types.h"	19 #include "ash/wm/workspace/workspace_types.h"

20 #include "base/basictypes.h"	20 #include "base/basictypes.h"

21 #include "base/compiler_specific.h"	21 #include "base/compiler_specific.h"

(...skipping 384 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
406	406

407 // The show hide animation duration override or 0 for default.	407 // The show hide animation duration override or 0 for default.

408 int duration_override_in_ms_;	408 int duration_override_in_ms_;

409	409

410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);	410 DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);

411 };	411 };

412	412

413 } // namespace ash	413 } // namespace ash

414	414

415 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_	415 #endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_

OLD	NEW