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

Unified Diff: ash/shell.cc

Issue 9704029: Reland r126700: ash uber tray: Add the detailed network popup (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 399082f5c3e929a658d16b4c5b0171ab3c7b38bc..06d35a56ff44334428e4b471119c5c5274e642c4 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -260,6 +260,9 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
virtual void ShowDateSettings() OVERRIDE {
}
+ virtual void ShowNetworkSettings() OVERRIDE {
+ }
+
virtual void ShowHelp() OVERRIDE {
}
@@ -282,9 +285,21 @@ class DummySystemTrayDelegate : public SystemTrayDelegate {
virtual void ShutDown() OVERRIDE {}
virtual void SignOut() OVERRIDE {}
virtual void RequestLockScreen() OVERRIDE {}
- virtual NetworkIconInfo GetMostRelevantNetworkIcon() {
+ virtual NetworkIconInfo GetMostRelevantNetworkIcon(bool large) OVERRIDE {
return NetworkIconInfo();
}
+ virtual void GetAvailableNetworks(
+ std::vector<NetworkIconInfo>* list) OVERRIDE {
+ }
+
+ virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
+ }
+
+ virtual void ToggleAirplaneMode() OVERRIDE {
+ }
+
+ virtual void ChangeProxySettings() OVERRIDE {
+ }
bool muted_;
float volume_;
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/system/network/tray_network.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698