ash/system/status_area_widget.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

Side by Side Diff: ash/system/status_area_widget.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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:

« no previous file with comments | « ash/system/status_area_widget.h ('k') | ash/system/status_area_widget_delegate.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/status_area_widget.h"	5 #include "ash/system/status_area_widget.h"

6	6

7 #include "ash/common/material_design/material_design_controller.h"	7 #include "ash/material_design/material_design_controller.h"

8 #include "ash/common/shelf/wm_shelf.h"

9 #include "ash/common/wm_shell.h"

10 #include "ash/common/wm_window.h"

11 #include "ash/public/cpp/shell_window_ids.h"	8 #include "ash/public/cpp/shell_window_ids.h"

12 #include "ash/root_window_controller.h"	9 #include "ash/root_window_controller.h"

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

13 #include "ash/system/ime_menu/ime_menu_tray.h"	11 #include "ash/system/ime_menu/ime_menu_tray.h"

14 #include "ash/system/overview/overview_button_tray.h"	12 #include "ash/system/overview/overview_button_tray.h"

15 #include "ash/system/palette/palette_tray.h"	13 #include "ash/system/palette/palette_tray.h"

16 #include "ash/system/palette/palette_utils.h"	14 #include "ash/system/palette/palette_utils.h"

17 #include "ash/system/session/logout_button_tray.h"	15 #include "ash/system/session/logout_button_tray.h"

18 #include "ash/system/status_area_widget_delegate.h"	16 #include "ash/system/status_area_widget_delegate.h"

19 #include "ash/system/tray/system_tray.h"	17 #include "ash/system/tray/system_tray.h"

20 #include "ash/system/tray/system_tray_delegate.h"	18 #include "ash/system/tray/system_tray_delegate.h"

21 #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"	19 #include "ash/system/virtual_keyboard/virtual_keyboard_tray.h"

22 #include "ash/system/web_notification/web_notification_tray.h"	20 #include "ash/system/web_notification/web_notification_tray.h"

	21 #include "ash/wm_shell.h"

	22 #include "ash/wm_window.h"

23 #include "base/i18n/time_formatting.h"	23 #include "base/i18n/time_formatting.h"

24 #include "ui/display/display.h"	24 #include "ui/display/display.h"

25 #include "ui/native_theme/native_theme_dark_aura.h"	25 #include "ui/native_theme/native_theme_dark_aura.h"

26	26

27 namespace ash {	27 namespace ash {

28	28

29 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,	29 StatusAreaWidget::StatusAreaWidget(WmWindow* status_container,

30 WmShelf* wm_shelf)	30 WmShelf* wm_shelf)

31 : status_area_widget_delegate_(new StatusAreaWidgetDelegate),	31 : status_area_widget_delegate_(new StatusAreaWidgetDelegate),

32 overview_button_tray_(nullptr),	32 overview_button_tray_(nullptr),

(...skipping 192 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
225 ime_menu_tray_ = new ImeMenuTray(wm_shelf_);	225 ime_menu_tray_ = new ImeMenuTray(wm_shelf_);

226 status_area_widget_delegate_->AddTray(ime_menu_tray_);	226 status_area_widget_delegate_->AddTray(ime_menu_tray_);

227 }	227 }

228	228

229 void StatusAreaWidget::AddOverviewButtonTray() {	229 void StatusAreaWidget::AddOverviewButtonTray() {

230 overview_button_tray_ = new OverviewButtonTray(wm_shelf_);	230 overview_button_tray_ = new OverviewButtonTray(wm_shelf_);

231 status_area_widget_delegate_->AddTray(overview_button_tray_);	231 status_area_widget_delegate_->AddTray(overview_button_tray_);

232 }	232 }

233	233

234 } // namespace ash	234 } // namespace ash

OLD	NEW