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

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

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 | 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 #include "chrome/browser/chromeos/status/clock_menu_button.h" 5 #include "chrome/browser/chromeos/status/clock_menu_button.h"
6 6
7 #include "app/gfx/canvas.h"
8 #include "app/gfx/font.h"
9 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
11 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
12 #include "base/string_util.h" 10 #include "base/string_util.h"
13 #include "base/time.h" 11 #include "base/time.h"
14 #include "chrome/browser/browser.h" 12 #include "chrome/browser/browser.h"
15 #include "chrome/browser/chromeos/status/status_area_host.h" 13 #include "chrome/browser/chromeos/status/status_area_host.h"
16 #include "chrome/browser/profile.h" 14 #include "chrome/browser/profile.h"
17 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.h"
16 #include "gfx/canvas.h"
17 #include "gfx/font.h"
18 #include "grit/generated_resources.h" 18 #include "grit/generated_resources.h"
19 #include "unicode/calendar.h" 19 #include "unicode/calendar.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 // Amount of slop to add into the timer to make sure we're into the next minute 23 // Amount of slop to add into the timer to make sure we're into the next minute
24 // when the timer goes off. 24 // when the timer goes off.
25 const int kTimerSlopSeconds = 1; 25 const int kTimerSlopSeconds = 1;
26 26
27 ClockMenuButton::ClockMenuButton(StatusAreaHost* host) 27 ClockMenuButton::ClockMenuButton(StatusAreaHost* host)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) { 148 void ClockMenuButton::RunMenu(views::View* source, const gfx::Point& pt) {
149 if (!clock_menu_.get()) 149 if (!clock_menu_.get())
150 clock_menu_.reset(new views::Menu2(this)); 150 clock_menu_.reset(new views::Menu2(this));
151 else 151 else
152 clock_menu_->Rebuild(); 152 clock_menu_->Rebuild();
153 clock_menu_->UpdateStates(); 153 clock_menu_->UpdateStates();
154 clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT); 154 clock_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
155 } 155 }
156 156
157 } // namespace chromeos 157 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/panels/panel_scroller_header.cc ('k') | chrome/browser/chromeos/status/network_menu_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698