| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/clock_menu_button.h" | 5 #include "chrome/browser/chromeos/status/clock_menu_button.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/i18n/time_formatting.h" | 9 #include "base/i18n/time_formatting.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/time.h" | 11 #include "base/time.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/browser/chromeos/cros/cros_library.h" | 13 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 14 #include "chrome/browser/chromeos/status/status_area_host.h" | 14 #include "chrome/browser/chromeos/status/status_area_host.h" |
| 15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/common/pref_names.h" | |
| 17 #include "gfx/canvas.h" | 16 #include "gfx/canvas.h" |
| 18 #include "gfx/font.h" | 17 #include "gfx/font.h" |
| 19 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
| 20 | 19 |
| 21 namespace chromeos { | 20 namespace chromeos { |
| 22 | 21 |
| 23 // Amount of slop to add into the timer to make sure we're into the next minute | 22 // Amount of slop to add into the timer to make sure we're into the next minute |
| 24 // when the timer goes off. | 23 // when the timer goes off. |
| 25 const int kTimerSlopSeconds = 1; | 24 const int kTimerSlopSeconds = 1; |
| 26 | 25 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { | 124 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { |
| 126 if (!clock_menu_.get()) | 125 if (!clock_menu_.get()) |
| 127 clock_menu_.reset(new views::Menu2(this)); | 126 clock_menu_.reset(new views::Menu2(this)); |
| 128 else | 127 else |
| 129 clock_menu_->Rebuild(); | 128 clock_menu_->Rebuild(); |
| 130 clock_menu_->UpdateStates(); | 129 clock_menu_->UpdateStates(); |
| 131 clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); | 130 clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); |
| 132 } | 131 } |
| 133 | 132 |
| 134 } // namespace chromeos | 133 } // namespace chromeos |
| OLD | NEW |