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

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

Issue 2396863004: chromeos: Refactor system tray ShowNetworkSettingsForGuid for mash (Closed)
Patch Set: rebase Created 4 years, 2 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
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/public/interfaces/system_tray.mojom.h" 8 #include "ash/public/interfaces/system_tray.mojom.h"
9 #include "base/i18n/time_formatting.h" 9 #include "base/i18n/time_formatting.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void ShowDisplaySettings(); 42 void ShowDisplaySettings();
43 void ShowPowerSettings(); 43 void ShowPowerSettings();
44 void ShowChromeSlow(); 44 void ShowChromeSlow();
45 void ShowIMESettings(); 45 void ShowIMESettings();
46 void ShowHelp(); 46 void ShowHelp();
47 void ShowAccessibilityHelp(); 47 void ShowAccessibilityHelp();
48 void ShowAccessibilitySettings(); 48 void ShowAccessibilitySettings();
49 void ShowPaletteHelp(); 49 void ShowPaletteHelp();
50 void ShowPaletteSettings(); 50 void ShowPaletteSettings();
51 void ShowPublicAccountInfo(); 51 void ShowPublicAccountInfo();
52 void ShowNetworkSettings(const std::string& network_id);
52 void ShowProxySettings(); 53 void ShowProxySettings();
53 54
54 // Binds the mojom::SystemTray interface to this object. 55 // Binds the mojom::SystemTray interface to this object.
55 void BindRequest(mojom::SystemTrayRequest request); 56 void BindRequest(mojom::SystemTrayRequest request);
56 57
57 private: 58 private:
58 // Connects or reconnects to the mojom::SystemTrayClient interface when 59 // Connects or reconnects to the mojom::SystemTrayClient interface when
59 // running on Chrome OS. Otherwise does nothing. Returns true if connected. 60 // running on Chrome OS. Otherwise does nothing. Returns true if connected.
60 bool ConnectToSystemTrayClient(); 61 bool ConnectToSystemTrayClient();
61 62
(...skipping 14 matching lines...) Expand all
76 77
77 // The type of clock hour display: 12 or 24 hour. 78 // The type of clock hour display: 12 or 24 hour.
78 base::HourClockType hour_clock_type_; 79 base::HourClockType hour_clock_type_;
79 80
80 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 81 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
81 }; 82 };
82 83
83 } // namspace ash 84 } // namspace ash
84 85
85 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 86 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698