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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/system/tray/default_system_tray_delegate.h

Issue 607613002: Elim parent_window parameter from network_connect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Elim includes Created 6 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
« no previous file with comments | « ash/system/chromeos/network/network_state_notifier_unittest.cc ('k') | ash/system/tray/default_system_tray_delegate.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/system_tray_delegate.h" 9 #include "ash/system/tray/system_tray_delegate.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual void RequestRestartForUpdate() OVERRIDE; 58 virtual void RequestRestartForUpdate() OVERRIDE;
59 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE; 59 virtual void GetAvailableBluetoothDevices(BluetoothDeviceList* list) OVERRIDE;
60 virtual void BluetoothStartDiscovering() OVERRIDE; 60 virtual void BluetoothStartDiscovering() OVERRIDE;
61 virtual void BluetoothStopDiscovering() OVERRIDE; 61 virtual void BluetoothStopDiscovering() OVERRIDE;
62 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE; 62 virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;
63 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE; 63 virtual void GetCurrentIME(IMEInfo* info) OVERRIDE;
64 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE; 64 virtual void GetAvailableIMEList(IMEInfoList* list) OVERRIDE;
65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE; 65 virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;
66 virtual void SwitchIME(const std::string& ime_id) OVERRIDE; 66 virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
67 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE; 67 virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
68 virtual void ShowNetworkConfigure(const std::string& network_id, 68 virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
69 gfx::NativeWindow parent_window) OVERRIDE; 69 virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
70 virtual bool EnrollNetwork(const std::string& network_id,
71 gfx::NativeWindow parent_window) OVERRIDE;
72 virtual void ManageBluetoothDevices() OVERRIDE; 70 virtual void ManageBluetoothDevices() OVERRIDE;
73 virtual void ToggleBluetooth() OVERRIDE; 71 virtual void ToggleBluetooth() OVERRIDE;
74 virtual bool IsBluetoothDiscovering() OVERRIDE; 72 virtual bool IsBluetoothDiscovering() OVERRIDE;
75 virtual void ShowMobileSimDialog() OVERRIDE; 73 virtual void ShowMobileSimDialog() OVERRIDE;
76 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE; 74 virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
77 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE; 75 virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
78 virtual bool GetBluetoothAvailable() OVERRIDE; 76 virtual bool GetBluetoothAvailable() OVERRIDE;
79 virtual bool GetBluetoothEnabled() OVERRIDE; 77 virtual bool GetBluetoothEnabled() OVERRIDE;
80 virtual bool GetBluetoothDiscovering() OVERRIDE; 78 virtual bool GetBluetoothDiscovering() OVERRIDE;
81 virtual void ChangeProxySettings() OVERRIDE; 79 virtual void ChangeProxySettings() OVERRIDE;
(...skipping 13 matching lines...) Expand all
95 private: 93 private:
96 bool bluetooth_enabled_; 94 bool bluetooth_enabled_;
97 scoped_ptr<VolumeControlDelegate> volume_control_delegate_; 95 scoped_ptr<VolumeControlDelegate> volume_control_delegate_;
98 96
99 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate); 97 DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
100 }; 98 };
101 99
102 } // namespace ash 100 } // namespace ash
103 101
104 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_ 102 #endif // ASH_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_notifier_unittest.cc ('k') | ash/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698