ash/shelf/shelf_widget.cc - Issue 24108003: [Cleanup] Rename WindowSettings to WindowState

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_widget.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase fix Created 7 years, 3 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/shelf/shelf_layout_manager.cc ('k') | ash/shell/shell_delegate_impl.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 "ash/shelf/shelf_widget.h"	5 #include "ash/shelf/shelf_widget.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/focus_cycler.h"	8 #include "ash/focus_cycler.h"

9 #include "ash/launcher/launcher_delegate.h"	9 #include "ash/launcher/launcher_delegate.h"

10 #include "ash/launcher/launcher_model.h"	10 #include "ash/launcher/launcher_model.h"

11 #include "ash/launcher/launcher_navigator.h"	11 #include "ash/launcher/launcher_navigator.h"

12 #include "ash/launcher/launcher_view.h"	12 #include "ash/launcher/launcher_view.h"

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

14 #include "ash/session_state_delegate.h"	14 #include "ash/session_state_delegate.h"

15 #include "ash/shelf/shelf_layout_manager.h"	15 #include "ash/shelf/shelf_layout_manager.h"

16 #include "ash/shelf/shelf_widget.h"	16 #include "ash/shelf/shelf_widget.h"

17 #include "ash/shell.h"	17 #include "ash/shell.h"

18 #include "ash/shell_window_ids.h"	18 #include "ash/shell_window_ids.h"

19 #include "ash/system/tray/system_tray_delegate.h"	19 #include "ash/system/tray/system_tray_delegate.h"

20 #include "ash/wm/property_util.h"

21 #include "ash/wm/status_area_layout_manager.h"	20 #include "ash/wm/status_area_layout_manager.h"

22 #include "ash/wm/window_properties.h"	21 #include "ash/wm/window_properties.h"

23 #include "ash/wm/workspace_controller.h"	22 #include "ash/wm/workspace_controller.h"

24 #include "grit/ash_resources.h"	23 #include "grit/ash_resources.h"

25 #include "ui/aura/client/activation_client.h"	24 #include "ui/aura/client/activation_client.h"

26 #include "ui/aura/root_window.h"	25 #include "ui/aura/root_window.h"

27 #include "ui/aura/window.h"	26 #include "ui/aura/window.h"

28 #include "ui/aura/window_observer.h"	27 #include "ui/aura/window_observer.h"

29 #include "ui/base/resource/resource_bundle.h"	28 #include "ui/base/resource/resource_bundle.h"

30 #include "ui/compositor/layer.h"	29 #include "ui/compositor/layer.h"

(...skipping 643 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
674 return delegate_view_->GetDimmerBoundsForTest();	673 return delegate_view_->GetDimmerBoundsForTest();

675 return gfx::Rect();	674 return gfx::Rect();

676 }	675 }

677	676

678 void ShelfWidget::DisableDimmingAnimationsForTest() {	677 void ShelfWidget::DisableDimmingAnimationsForTest() {

679 DCHECK(delegate_view_);	678 DCHECK(delegate_view_);

680 return delegate_view_->disable_dimming_animations_for_test();	679 return delegate_view_->disable_dimming_animations_for_test();

681 }	680 }

682	681

683 } // namespace ash	682 } // namespace ash

OLD	NEW