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

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

Issue 8930001: Fix up status area clock code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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_BUTTON_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_ 6 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // views::MenuButton overrides. 67 // views::MenuButton overrides.
68 virtual bool Activate() OVERRIDE; 68 virtual bool Activate() OVERRIDE;
69 69
70 // View overrides. 70 // View overrides.
71 virtual gfx::Size GetPreferredSize() OVERRIDE; 71 virtual gfx::Size GetPreferredSize() OVERRIDE;
72 virtual gfx::Insets GetInsets() const OVERRIDE; 72 virtual gfx::Insets GetInsets() const OVERRIDE;
73 virtual void OnThemeChanged() OVERRIDE; 73 virtual void OnThemeChanged() OVERRIDE;
74 virtual void SetVisible(bool visible) OVERRIDE; 74 virtual void SetVisible(bool visible) OVERRIDE;
75 virtual bool HitTest(const gfx::Point& l) const OVERRIDE; 75 virtual bool HitTest(const gfx::Point& l) const OVERRIDE;
76 76
77 void set_menu_active(bool active) { menu_active_ = active; } 77 virtual void SetMenuActive(bool active);
oshima 2011/12/13 06:06:21 Are you going to use this virtual in separate CL?
stevenjb 2011/12/14 02:19:21 I'm overriding it in ClockMenuButton. I'll add a c
78
78 bool menu_active() const { return menu_active_; } 79 bool menu_active() const { return menu_active_; }
79 80
80 protected: 81 protected:
81 Delegate* delegate() { return delegate_; } 82 Delegate* delegate() { return delegate_; }
82 const Delegate* delegate() const { return delegate_; } 83 const Delegate* delegate() const { return delegate_; }
83 84
84 // Subclasses should override these methods to return the correct dimensions. 85 // Subclasses should override these methods to return the correct dimensions.
85 virtual int icon_height(); 86 virtual int icon_height();
86 virtual int icon_width(); 87 virtual int icon_width();
87 88
(...skipping 11 matching lines...) Expand all
99 100
100 private: 101 private:
101 void UpdateTextStyle(); 102 void UpdateTextStyle();
102 103
103 Delegate* delegate_; 104 Delegate* delegate_;
104 105
105 DISALLOW_COPY_AND_ASSIGN(StatusAreaButton); 106 DISALLOW_COPY_AND_ASSIGN(StatusAreaButton);
106 }; 107 };
107 108
108 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_ 109 #endif // CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698