Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

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: 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
OLDNEW
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"
James Cook 2013/09/18 20:44:17 Nice that you were able to clean up all of these.
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 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
593 ash::internal::ShelfLayoutManager* shelf = 592 ash::internal::ShelfLayoutManager* shelf =
594 ShelfLayoutManager::ForLauncher(root_window); 593 ShelfLayoutManager::ForLauncher(root_window);
595 bubble_view->SetArrowPaintType( 594 bubble_view->SetArrowPaintType(
596 (shelf && shelf->IsVisible()) ? 595 (shelf && shelf->IsVisible()) ?
597 views::BubbleBorder::PAINT_NORMAL : 596 views::BubbleBorder::PAINT_NORMAL :
598 views::BubbleBorder::PAINT_TRANSPARENT); 597 views::BubbleBorder::PAINT_TRANSPARENT);
599 } 598 }
600 599
601 } // namespace internal 600 } // namespace internal
602 } // namespace ash 601 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698