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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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 // Note: this file is used by Aura on all platforms, even though it is currently 5 // Note: this file is used by Aura on all platforms, even though it is currently
6 // in a chromeos specific location. 6 // in a chromeos specific location.
7 7
8 #include "chrome/browser/chromeos/status/clock_menu_button.h" 8 #include "chrome/browser/chromeos/status/clock_menu_button.h"
9 9
10 #include "base/i18n/time_formatting.h" 10 #include "base/i18n/time_formatting.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h" 14 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
15 #include "chrome/browser/chromeos/view_ids.h" 15 #include "chrome/browser/chromeos/view_ids.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile_manager.h" 17 #include "chrome/browser/profiles/profile_manager.h"
18 #include "chrome/common/chrome_notification_types.h" 18 #include "chrome/common/chrome_notification_types.h"
19 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
20 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
21 #include "content/public/browser/notification_source.h" 21 #include "content/public/browser/notification_source.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/gfx/canvas.h" 24 #include "ui/gfx/canvas.h"
25 #include "ui/gfx/font.h" 25 #include "ui/gfx/font.h"
26 #include "ui/views/widget/widget.h"
26 #include "unicode/datefmt.h" 27 #include "unicode/datefmt.h"
27 #include "views/controls/menu/menu_runner.h" 28 #include "views/controls/menu/menu_runner.h"
28 #include "views/widget/widget.h"
29 29
30 namespace { 30 namespace {
31 31
32 // views::MenuItemView item ids 32 // views::MenuItemView item ids
33 enum ClockMenuItem { 33 enum ClockMenuItem {
34 CLOCK_DISPLAY_ITEM, 34 CLOCK_DISPLAY_ITEM,
35 CLOCK_OPEN_OPTIONS_ITEM 35 CLOCK_OPEN_OPTIONS_ITEM
36 }; 36 };
37 37
38 } // namespace 38 } // namespace
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 if (delegate()->ShouldExecuteStatusAreaCommand( 186 if (delegate()->ShouldExecuteStatusAreaCommand(
187 this, StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS)) { 187 this, StatusAreaButton::Delegate::SHOW_SYSTEM_OPTIONS)) {
188 menu->AppendSeparator(); 188 menu->AppendSeparator();
189 189
190 const string16 clock_open_options_label = 190 const string16 clock_open_options_label =
191 l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG); 191 l10n_util::GetStringUTF16(IDS_STATUSBAR_CLOCK_OPEN_OPTIONS_DIALOG);
192 menu->AppendMenuItemWithLabel(CLOCK_OPEN_OPTIONS_ITEM, 192 menu->AppendMenuItemWithLabel(CLOCK_OPEN_OPTIONS_ITEM,
193 clock_open_options_label); 193 clock_open_options_label);
194 } 194 }
195 } 195 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/status/caps_lock_menu_button.cc ('k') | chrome/browser/chromeos/status/input_method_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698