chrome/browser/chromeos/status/status_area_view_chromeos.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

Side by Side Diff: chrome/browser/chromeos/status/status_area_view_chromeos.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 8 years, 8 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

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 "chrome/browser/chromeos/status/status_area_view_chromeos.h"	5 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"

6	6

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

8 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"

9 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"	8 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"

10 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h"	9 #include "chrome/browser/chromeos/status/caps_lock_menu_button.h"

11 #include "chrome/browser/chromeos/status/clock_menu_button.h"	10 #include "chrome/browser/chromeos/status/clock_menu_button.h"

12 #include "chrome/browser/chromeos/status/input_method_menu_button.h"	11 #include "chrome/browser/chromeos/status/input_method_menu_button.h"

13 #include "chrome/browser/chromeos/status/memory_menu_button.h"	12 #include "chrome/browser/chromeos/status/memory_menu_button.h"

14 #include "chrome/browser/chromeos/status/network_menu_button.h"	13 #include "chrome/browser/chromeos/status/network_menu_button.h"

15 #include "chrome/browser/chromeos/status/power_menu_button.h"	14 #include "chrome/browser/chromeos/status/power_menu_button.h"

16 #include "chrome/browser/chromeos/status/volume_menu_button.h"	15 #include "chrome/browser/chromeos/status/volume_menu_button.h"

17 #include "chrome/browser/chromeos/view_ids.h"	16 #include "chrome/browser/chromeos/view_ids.h"

18 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

	18 #include "chromeos/dbus/dbus_thread_manager.h"

19	19

20 namespace chromeos {	20 namespace chromeos {

21	21

22 // static	22 // static

23 StatusAreaViewChromeos::ScreenMode	23 StatusAreaViewChromeos::ScreenMode

24 StatusAreaViewChromeos::screen_mode_ = BROWSER_MODE;	24 StatusAreaViewChromeos::screen_mode_ = BROWSER_MODE;

25	25

26 // static	26 // static

27 bool StatusAreaViewChromeos::IsBrowserMode() {	27 bool StatusAreaViewChromeos::IsBrowserMode() {

28 return screen_mode_ == BROWSER_MODE;	28 return screen_mode_ == BROWSER_MODE;

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94 StatusAreaView::NO_BORDER);	94 StatusAreaView::NO_BORDER);

95 status_area->AddButton(new InputMethodMenuButton(delegate),	95 status_area->AddButton(new InputMethodMenuButton(delegate),

96 StatusAreaView::NO_BORDER);	96 StatusAreaView::NO_BORDER);

97 status_area->AddButton(new NetworkMenuButton(delegate),	97 status_area->AddButton(new NetworkMenuButton(delegate),

98 StatusAreaView::NO_BORDER);	98 StatusAreaView::NO_BORDER);

99 status_area->AddButton(new PowerMenuButton(delegate),	99 status_area->AddButton(new PowerMenuButton(delegate),

100 StatusAreaView::NO_BORDER);	100 StatusAreaView::NO_BORDER);

101 }	101 }

102	102

103 } // namespace chromeos	103 } // namespace chromeos

OLD	NEW