ash/system/tray/system_tray.cc - Issue 174803002: Move root_window.* to window_event_dispatcher.*

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 10 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/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_background_view.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/system/tray/system_tray.h"	5 #include "ash/system/tray/system_tray.h"

6	6

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

8 #include "ash/metrics/user_metrics_recorder.h"	8 #include "ash/metrics/user_metrics_recorder.h"

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

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

(...skipping 16 matching lines...) Expand all Loading...
27 #include "ash/system/tray_update.h"	27 #include "ash/system/tray_update.h"

28 #include "ash/system/user/login_status.h"	28 #include "ash/system/user/login_status.h"

29 #include "ash/system/user/tray_user.h"	29 #include "ash/system/user/tray_user.h"

30 #include "ash/system/user/tray_user_separator.h"	30 #include "ash/system/user/tray_user_separator.h"

31 #include "ash/system/web_notification/web_notification_tray.h"	31 #include "ash/system/web_notification/web_notification_tray.h"

32 #include "base/command_line.h"	32 #include "base/command_line.h"

33 #include "base/logging.h"	33 #include "base/logging.h"

34 #include "base/strings/utf_string_conversions.h"	34 #include "base/strings/utf_string_conversions.h"

35 #include "base/timer/timer.h"	35 #include "base/timer/timer.h"

36 #include "grit/ash_strings.h"	36 #include "grit/ash_strings.h"

37 #include "ui/aura/root_window.h"	37 #include "ui/aura/window_event_dispatcher.h"

38 #include "ui/base/l10n/l10n_util.h"	38 #include "ui/base/l10n/l10n_util.h"

39 #include "ui/compositor/layer.h"	39 #include "ui/compositor/layer.h"

40 #include "ui/events/event_constants.h"	40 #include "ui/events/event_constants.h"

41 #include "ui/gfx/canvas.h"	41 #include "ui/gfx/canvas.h"

42 #include "ui/gfx/screen.h"	42 #include "ui/gfx/screen.h"

43 #include "ui/gfx/skia_util.h"	43 #include "ui/gfx/skia_util.h"

44 #include "ui/views/border.h"	44 #include "ui/views/border.h"

45 #include "ui/views/controls/label.h"	45 #include "ui/views/controls/label.h"

46 #include "ui/views/layout/box_layout.h"	46 #include "ui/views/layout/box_layout.h"

47 #include "ui/views/layout/fill_layout.h"	47 #include "ui/views/layout/fill_layout.h"

(...skipping 680 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
728 system_bubble_.reset();	728 system_bubble_.reset();

729 // When closing a system bubble with the alternate shelf layout, we need to	729 // When closing a system bubble with the alternate shelf layout, we need to

730 // turn off the active tinting of the shelf.	730 // turn off the active tinting of the shelf.

731 if (full_system_tray_menu_) {	731 if (full_system_tray_menu_) {

732 SetDrawBackgroundAsActive(false);	732 SetDrawBackgroundAsActive(false);

733 full_system_tray_menu_ = false;	733 full_system_tray_menu_ = false;

734 }	734 }

735 }	735 }

736	736

737 } // namespace ash	737 } // namespace ash

OLD	NEW