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

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

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/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('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 #include "ash/system/tray/default_system_tray_delegate.h" 5 #include "ash/system/tray/default_system_tray_delegate.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "ash/session/session_state_delegate.h" 9 #include "ash/session/session_state_delegate.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 IMEPropertyInfoList* list) { 200 IMEPropertyInfoList* list) {
201 } 201 }
202 202
203 void DefaultSystemTrayDelegate::SwitchIME(const std::string& ime_id) { 203 void DefaultSystemTrayDelegate::SwitchIME(const std::string& ime_id) {
204 } 204 }
205 205
206 void DefaultSystemTrayDelegate::ActivateIMEProperty(const std::string& key) { 206 void DefaultSystemTrayDelegate::ActivateIMEProperty(const std::string& key) {
207 } 207 }
208 208
209 void DefaultSystemTrayDelegate::ShowNetworkConfigure( 209 void DefaultSystemTrayDelegate::ShowNetworkConfigure(
210 const std::string& network_id, 210 const std::string& network_id) {
211 gfx::NativeWindow parent_window) {
212 } 211 }
213 212
214 bool DefaultSystemTrayDelegate::EnrollNetwork(const std::string& network_id, 213 bool DefaultSystemTrayDelegate::EnrollNetwork(const std::string& network_id) {
215 gfx::NativeWindow parent_window) {
216 return true; 214 return true;
217 } 215 }
218 216
219 void DefaultSystemTrayDelegate::ManageBluetoothDevices() { 217 void DefaultSystemTrayDelegate::ManageBluetoothDevices() {
220 } 218 }
221 219
222 void DefaultSystemTrayDelegate::ToggleBluetooth() { 220 void DefaultSystemTrayDelegate::ToggleBluetooth() {
223 bluetooth_enabled_ = !bluetooth_enabled_; 221 bluetooth_enabled_ = !bluetooth_enabled_;
224 } 222 }
225 223
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() { 282 bool DefaultSystemTrayDelegate::IsSearchKeyMappedToCapsLock() {
285 return false; 283 return false;
286 } 284 }
287 285
288 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate( 286 tray::UserAccountsDelegate* DefaultSystemTrayDelegate::GetUserAccountsDelegate(
289 const std::string& user_id) { 287 const std::string& user_id) {
290 return NULL; 288 return NULL;
291 } 289 }
292 290
293 } // namespace ash 291 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.h ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698