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

Side by Side Diff: ash/common/system/tray/system_tray_controller.h

Issue 2438023004: mash: Migrate ShowSetTimeDialog from SystemTrayDelegate to mojo (Closed)
Patch Set: rebase Created 4 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
« no previous file with comments | « ash/common/system/date/date_view.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/public/interfaces/system_tray.mojom.h" 9 #include "ash/public/interfaces/system_tray.mojom.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 24 matching lines...) Expand all
35 : NON_EXPORTED_BASE(public mojom::SystemTray) { 35 : NON_EXPORTED_BASE(public mojom::SystemTray) {
36 public: 36 public:
37 explicit SystemTrayController(service_manager::Connector* connector); 37 explicit SystemTrayController(service_manager::Connector* connector);
38 ~SystemTrayController() override; 38 ~SystemTrayController() override;
39 39
40 base::HourClockType hour_clock_type() const { return hour_clock_type_; } 40 base::HourClockType hour_clock_type() const { return hour_clock_type_; }
41 41
42 // Wrappers around the mojom::SystemTrayClient interface. 42 // Wrappers around the mojom::SystemTrayClient interface.
43 void ShowSettings(); 43 void ShowSettings();
44 void ShowDateSettings(); 44 void ShowDateSettings();
45 void ShowSetTimeDialog();
45 void ShowDisplaySettings(); 46 void ShowDisplaySettings();
46 void ShowPowerSettings(); 47 void ShowPowerSettings();
47 void ShowChromeSlow(); 48 void ShowChromeSlow();
48 void ShowIMESettings(); 49 void ShowIMESettings();
49 void ShowHelp(); 50 void ShowHelp();
50 void ShowAccessibilityHelp(); 51 void ShowAccessibilityHelp();
51 void ShowAccessibilitySettings(); 52 void ShowAccessibilitySettings();
52 void ShowPaletteHelp(); 53 void ShowPaletteHelp();
53 void ShowPaletteSettings(); 54 void ShowPaletteSettings();
54 void ShowPublicAccountInfo(); 55 void ShowPublicAccountInfo();
(...skipping 26 matching lines...) Expand all
81 82
82 // The type of clock hour display: 12 or 24 hour. 83 // The type of clock hour display: 12 or 24 hour.
83 base::HourClockType hour_clock_type_; 84 base::HourClockType hour_clock_type_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 86 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
86 }; 87 };
87 88
88 } // namspace ash 89 } // namspace ash
89 90
90 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 91 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/common/system/date/date_view.cc ('k') | ash/common/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698