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

Side by Side Diff: chrome/browser/chromeos/clock_menu_button.h

Issue 341044: Move chromeos code to namespace chromeos. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_CLOCK_MENU_BUTTON_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
6 #define CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_ 6 #define CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
7 7
8 #include "base/timer.h" 8 #include "base/timer.h"
9 #include "chrome/common/notification_observer.h" 9 #include "chrome/common/notification_observer.h"
10 #include "chrome/common/pref_member.h" 10 #include "chrome/common/pref_member.h"
11 #include "views/controls/button/menu_button.h" 11 #include "views/controls/button/menu_button.h"
12 #include "views/controls/menu/menu_2.h" 12 #include "views/controls/menu/menu_2.h"
13 #include "views/controls/menu/view_menu_delegate.h" 13 #include "views/controls/menu/view_menu_delegate.h"
14 14
15 class Browser; 15 class Browser;
16 16
17 namespace chromeos {
18
17 // The clock menu button in the status area. 19 // The clock menu button in the status area.
18 // This button shows the current time. 20 // This button shows the current time.
19 class ClockMenuButton : public views::MenuButton, 21 class ClockMenuButton : public views::MenuButton,
20 public views::ViewMenuDelegate, 22 public views::ViewMenuDelegate,
21 public views::Menu2Model, 23 public views::Menu2Model,
22 public NotificationObserver { 24 public NotificationObserver {
23 public: 25 public:
24 explicit ClockMenuButton(Browser* browser); 26 explicit ClockMenuButton(Browser* browser);
25 virtual ~ClockMenuButton() {} 27 virtual ~ClockMenuButton() {}
26 28
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 65
64 // The clock menu. 66 // The clock menu.
65 views::Menu2 clock_menu_; 67 views::Menu2 clock_menu_;
66 68
67 // The browser window that owns us. 69 // The browser window that owns us.
68 Browser* browser_; 70 Browser* browser_;
69 71
70 DISALLOW_COPY_AND_ASSIGN(ClockMenuButton); 72 DISALLOW_COPY_AND_ASSIGN(ClockMenuButton);
71 }; 73 };
72 74
75 } // namespace chromeos
76
73 #endif // CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_ 77 #endif // CHROME_BROWSER_CHROMEOS_CLOCK_MENU_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698