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

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

Issue 8500005: Reverting this as it breaks (at least) the Windows Aura build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_
7 #pragma once 7 #pragma once
8 8
9 #include "chrome/browser/chromeos/status/status_area_view.h" 9 #include "chrome/browser/chromeos/status/status_area_view.h"
10 10
11 #include "chrome/browser/chromeos/cros/power_library.h" 11 #include "chrome/browser/chromeos/cros/power_library.h"
12 #include "chrome/browser/chromeos/system/timezone_settings.h" 12 #include "chrome/browser/chromeos/system/timezone_settings.h"
13 #include "chrome/browser/chromeos/view_ids.h" 13 #include "chrome/browser/chromeos/view_ids.h"
14 14
15 class ClockMenuButton;
16
17 namespace chromeos { 15 namespace chromeos {
18 16
19 class StatusAreaViewChromeos : public StatusAreaView, 17 class StatusAreaViewChromeos : public StatusAreaView,
20 public PowerLibrary::Observer, 18 public PowerLibrary::Observer,
21 public system::TimezoneSettings::Observer { 19 public system::TimezoneSettings::Observer {
22 public: 20 public:
23 // The type of screen the host window is on. 21 // The type of screen the host window is on.
24 enum ScreenMode { 22 enum ScreenMode {
25 LOGIN_MODE_VIEWS, // The host is for the views-based OOBE/login screens. 23 LOGIN_MODE_VIEWS, // The host is for the views-based OOBE/login screens.
26 LOGIN_MODE_WEBUI, // The host is for the WebUI OOBE/login screens. 24 LOGIN_MODE_WEBUI, // The host is for the WebUI OOBE/login screens.
27 BROWSER_MODE, // The host is for browser. 25 BROWSER_MODE, // The host is for browser.
28 SCREEN_LOCKER_MODE, // The host is for screen locker. 26 SCREEN_LOCKER_MODE, // The host is for screen locker.
29 }; 27 };
30 28
31 explicit StatusAreaViewChromeos(); 29 explicit StatusAreaViewChromeos();
32 virtual ~StatusAreaViewChromeos(); 30 virtual ~StatusAreaViewChromeos();
33 31
34 void Init(StatusAreaButton::Delegate* delegate, ScreenMode screen_mode); 32 void Init(StatusAreaButton::Delegate* delegate, ScreenMode screen_mode);
35 33
36 // PowerLibrary::Observer: 34 // PowerLibrary::Observer:
37 virtual void SystemResumed() OVERRIDE; 35 virtual void SystemResumed() OVERRIDE;
38 36
39 // TimezoneSettings::Observer: 37 // TimezoneSettings::Observer:
40 virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE; 38 virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
41 39
42 // Sets default use 24hour clock mode. 40 // Sets default use 24hour clock mode.
43 void SetDefaultUse24HourClock(bool use_24hour_clock); 41 void SetDefaultUse24HourClock(bool use_24hour_clock);
44 42
45 // Convenience function to add buttons to a status area for ChromeOS. 43 // Convenience function to add buttons to a status area for ChromeOS.
46 // |clock_button| (if non-NULL) is set to the ClockMenuButton that is created
47 // by this method.
48 static void AddChromeosButtons(StatusAreaView* status_area, 44 static void AddChromeosButtons(StatusAreaView* status_area,
49 StatusAreaButton::Delegate* delegate, 45 StatusAreaButton::Delegate* delegate,
50 ScreenMode screen_mode, 46 ScreenMode screen_mode);
51 ClockMenuButton** clock_button);
52 47
53 private: 48 private:
54 void UpdateClockText(); 49 void UpdateClockText();
55 50
56 DISALLOW_COPY_AND_ASSIGN(StatusAreaViewChromeos); 51 DISALLOW_COPY_AND_ASSIGN(StatusAreaViewChromeos);
57 }; 52 };
58 53
59 } // namespace chromeos 54 } // namespace chromeos
60 55
61 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_ 56 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_VIEW_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698