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

Side by Side Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 10230012: This reduces so the enrollment dialog so it just spawns a tab. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for review Created 8 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/status/network_menu.h" 5 #include "chrome/browser/chromeos/status/network_menu.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 case TYPE_ETHERNET: { 339 case TYPE_ETHERNET: {
340 ShowTabbedNetworkSettings(network); 340 ShowTabbedNetworkSettings(network);
341 break; 341 break;
342 } 342 }
343 case TYPE_WIFI: { 343 case TYPE_WIFI: {
344 WifiNetwork* wifi = static_cast<WifiNetwork*>(network); 344 WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
345 if (wifi->connecting_or_connected()) { 345 if (wifi->connecting_or_connected()) {
346 ShowTabbedNetworkSettings(wifi); 346 ShowTabbedNetworkSettings(wifi);
347 } else { 347 } else {
348 wifi->SetEnrollmentDelegate( 348 wifi->SetEnrollmentDelegate(
349 EnrollmentDialogView::CreateEnrollmentDelegate( 349 CreateEnrollmentDelegate(delegate()->GetNativeWindow(),
350 delegate()->GetNativeWindow())); 350 ProfileManager::GetLastUsedProfile()));
351 wifi->AttemptConnection(base::Bind(&NetworkMenu::DoConnect, 351 wifi->AttemptConnection(base::Bind(&NetworkMenu::DoConnect,
352 weak_pointer_factory_.GetWeakPtr(), 352 weak_pointer_factory_.GetWeakPtr(),
353 wifi)); 353 wifi));
354 } 354 }
355 break; 355 break;
356 } 356 }
357 357
358 case TYPE_CELLULAR: { 358 case TYPE_CELLULAR: {
359 CellularNetwork* cell = static_cast<CellularNetwork*>(network); 359 CellularNetwork* cell = static_cast<CellularNetwork*>(network);
360 if (cell->NeedsActivation()) { 360 if (cell->NeedsActivation()) {
361 ActivateCellular(cell); 361 ActivateCellular(cell);
362 } else if (cell->connecting_or_connected()) { 362 } else if (cell->connecting_or_connected()) {
363 // Cellular network is connecting or connected, 363 // Cellular network is connecting or connected,
364 // so we show the config settings for the cellular network. 364 // so we show the config settings for the cellular network.
365 ShowTabbedNetworkSettings(cell); 365 ShowTabbedNetworkSettings(cell);
366 } else { 366 } else {
367 // Clicked on a disconnected cellular network, so connect to it. 367 // Clicked on a disconnected cellular network, so connect to it.
368 cros->ConnectToCellularNetwork(cell); 368 cros->ConnectToCellularNetwork(cell);
369 } 369 }
370 break; 370 break;
371 } 371 }
372 372
373 case TYPE_VPN: { 373 case TYPE_VPN: {
374 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network); 374 VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
375 // Connect or reconnect. 375 // Connect or reconnect.
376 if (vpn->connecting_or_connected()) { 376 if (vpn->connecting_or_connected()) {
377 ShowTabbedNetworkSettings(vpn); 377 ShowTabbedNetworkSettings(vpn);
378 } else { 378 } else {
379 vpn->SetEnrollmentDelegate( 379 vpn->SetEnrollmentDelegate(
380 EnrollmentDialogView::CreateEnrollmentDelegate( 380 CreateEnrollmentDelegate(delegate()->GetNativeWindow(),
381 delegate()->GetNativeWindow())); 381 ProfileManager::GetLastUsedProfile()));
382 vpn->AttemptConnection(base::Bind(&NetworkMenu::DoConnect, 382 vpn->AttemptConnection(base::Bind(&NetworkMenu::DoConnect,
383 weak_pointer_factory_.GetWeakPtr(), 383 weak_pointer_factory_.GetWeakPtr(),
384 vpn)); 384 vpn));
385 } 385 }
386 break; 386 break;
387 } 387 }
388 388
389 default: 389 default:
390 break; 390 break;
391 } 391 }
(...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after
1102 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) { 1102 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) {
1103 return ::ShouldHighlightNetwork(network); 1103 return ::ShouldHighlightNetwork(network);
1104 } 1104 }
1105 1105
1106 Browser* NetworkMenu::GetAppropriateBrowser() { 1106 Browser* NetworkMenu::GetAppropriateBrowser() {
1107 return Browser::GetOrCreateTabbedBrowser( 1107 return Browser::GetOrCreateTabbedBrowser(
1108 ProfileManager::GetDefaultProfileOrOffTheRecord()); 1108 ProfileManager::GetDefaultProfileOrOffTheRecord());
1109 } 1109 }
1110 1110
1111 } // namespace chromeos 1111 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698