ash/system/tray/tray_background_view.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/system/tray/tray_background_view.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

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/system/tray/tray_background_view.h"	5 #include "ash/system/tray/tray_background_view.h"

6	6

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

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

9 #include "ash/screen_ash.h"	9 #include "ash/screen_ash.h"

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

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

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

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

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

15 #include "ash/system/status_area_widget_delegate.h"	15 #include "ash/system/status_area_widget_delegate.h"

16 #include "ash/system/tray/system_tray.h"	16 #include "ash/system/tray/system_tray.h"

17 #include "ash/system/tray/tray_constants.h"	17 #include "ash/system/tray/tray_constants.h"

18 #include "ash/system/tray/tray_event_filter.h"	18 #include "ash/system/tray/tray_event_filter.h"

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

20 #include "ash/wm/window_animations.h"	19 #include "ash/wm/window_animations.h"

21 #include "grit/ash_resources.h"	20 #include "grit/ash_resources.h"

22 #include "ui/aura/root_window.h"	21 #include "ui/aura/root_window.h"

23 #include "ui/aura/window.h"	22 #include "ui/aura/window.h"

24 #include "ui/base/accessibility/accessible_view_state.h"	23 #include "ui/base/accessibility/accessible_view_state.h"

25 #include "ui/base/resource/resource_bundle.h"	24 #include "ui/base/resource/resource_bundle.h"

26 #include "ui/gfx/canvas.h"	25 #include "ui/gfx/canvas.h"

27 #include "ui/gfx/image/image_skia.h"	26 #include "ui/gfx/image/image_skia.h"

28 #include "ui/gfx/image/image_skia_operations.h"	27 #include "ui/gfx/image/image_skia_operations.h"

29 #include "ui/gfx/rect.h"	28 #include "ui/gfx/rect.h"

(...skipping 598 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
628 ash::internal::ShelfLayoutManager* shelf =	627 ash::internal::ShelfLayoutManager* shelf =

629 ShelfLayoutManager::ForLauncher(root_window);	628 ShelfLayoutManager::ForLauncher(root_window);

630 bubble_view->SetArrowPaintType(	629 bubble_view->SetArrowPaintType(

631 (shelf && shelf->IsVisible()) ?	630 (shelf && shelf->IsVisible()) ?

632 views::BubbleBorder::PAINT_NORMAL :	631 views::BubbleBorder::PAINT_NORMAL :

633 views::BubbleBorder::PAINT_TRANSPARENT);	632 views::BubbleBorder::PAINT_TRANSPARENT);

634 }	633 }

635	634

636 } // namespace internal	635 } // namespace internal

637 } // namespace ash	636 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/shell/toplevel_window.cc ('k') | ash/test/test_shell_delegate.cc » ('j') | no next file with comments »