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

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

Issue 10391158: Moves methods for finding browsers to browser_finder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include fixs 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"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/stringprintf.h" 14 #include "base/stringprintf.h"
15 #include "base/utf_string_conversions.h" 15 #include "base/utf_string_conversions.h"
16 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h" 16 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
17 #include "chrome/browser/chromeos/cros/cros_library.h" 17 #include "chrome/browser/chromeos/cros/cros_library.h"
18 #include "chrome/browser/chromeos/enrollment_dialog_view.h" 18 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
19 #include "chrome/browser/chromeos/login/user_manager.h" 19 #include "chrome/browser/chromeos/login/user_manager.h"
20 #include "chrome/browser/chromeos/mobile_config.h" 20 #include "chrome/browser/chromeos/mobile_config.h"
21 #include "chrome/browser/chromeos/options/network_config_view.h" 21 #include "chrome/browser/chromeos/options/network_config_view.h"
22 #include "chrome/browser/chromeos/sim_dialog_delegate.h" 22 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
23 #include "chrome/browser/chromeos/status/network_menu_icon.h" 23 #include "chrome/browser/chromeos/status/network_menu_icon.h"
24 #include "chrome/browser/defaults.h" 24 #include "chrome/browser/defaults.h"
25 #include "chrome/browser/profiles/profile_manager.h" 25 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/ui/browser.h" 26 #include "chrome/browser/ui/browser.h"
27 #include "chrome/browser/ui/browser_finder.h"
27 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
28 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
29 #include "content/public/browser/browser_thread.h" 30 #include "content/public/browser/browser_thread.h"
30 #include "grit/generated_resources.h" 31 #include "grit/generated_resources.h"
31 #include "grit/theme_resources.h" 32 #include "grit/theme_resources.h"
32 #include "net/base/escape.h" 33 #include "net/base/escape.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 34 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "ui/base/l10n/l10n_util.h" 35 #include "ui/base/l10n/l10n_util.h"
35 #include "ui/base/models/menu_model.h" 36 #include "ui/base/models/menu_model.h"
36 #include "ui/base/resource/resource_bundle.h" 37 #include "ui/base/resource/resource_bundle.h"
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 owner_->ShowTabbedNetworkSettings(cros->ethernet_network()); 492 owner_->ShowTabbedNetworkSettings(cros->ethernet_network());
492 } else if (flags & (FLAG_WIFI | FLAG_ADD_WIFI | 493 } else if (flags & (FLAG_WIFI | FLAG_ADD_WIFI |
493 FLAG_CELLULAR | FLAG_ADD_CELLULAR | 494 FLAG_CELLULAR | FLAG_ADD_CELLULAR |
494 FLAG_VPN | FLAG_ADD_VPN)) { 495 FLAG_VPN | FLAG_ADD_VPN)) {
495 ConnectToNetworkAt(index, std::string(), std::string(), -1); 496 ConnectToNetworkAt(index, std::string(), std::string(), -1);
496 } else if (flags & FLAG_DISCONNECT_VPN) { 497 } else if (flags & FLAG_DISCONNECT_VPN) {
497 const VirtualNetwork* active_vpn = cros->virtual_network(); 498 const VirtualNetwork* active_vpn = cros->virtual_network();
498 if (active_vpn) 499 if (active_vpn)
499 cros->DisconnectFromNetwork(active_vpn); 500 cros->DisconnectFromNetwork(active_vpn);
500 } else if (flags & FLAG_VIEW_ACCOUNT) { 501 } else if (flags & FLAG_VIEW_ACCOUNT) {
501 Browser* browser = Browser::GetOrCreateTabbedBrowser( 502 Browser* browser = browser::FindOrCreateTabbedBrowser(
502 ProfileManager::GetDefaultProfileOrOffTheRecord()); 503 ProfileManager::GetDefaultProfileOrOffTheRecord());
503 browser->ShowSingletonTab(GURL(top_up_url_)); 504 browser->ShowSingletonTab(GURL(top_up_url_));
504 } 505 }
505 } 506 }
506 507
507 void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) { 508 void NetworkMenuModel::SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {
508 } 509 }
509 510
510 //////////////////////////////////////////////////////////////////////////////// 511 ////////////////////////////////////////////////////////////////////////////////
511 // NetworkMenuModel, private methods: 512 // NetworkMenuModel, private methods:
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 void NetworkMenu::ShowOtherCellular() { 1102 void NetworkMenu::ShowOtherCellular() {
1102 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow()); 1103 ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
1103 } 1104 }
1104 1105
1105 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) { 1106 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) {
1106 return ::ShouldHighlightNetwork(network); 1107 return ::ShouldHighlightNetwork(network);
1107 } 1108 }
1108 1109
1109 Browser* NetworkMenu::GetAppropriateBrowser() const { 1110 Browser* NetworkMenu::GetAppropriateBrowser() const {
1110 DCHECK(chromeos::UserManager::Get()->IsSessionStarted()); 1111 DCHECK(chromeos::UserManager::Get()->IsSessionStarted());
1111 return Browser::GetOrCreateTabbedBrowser( 1112 return browser::FindOrCreateTabbedBrowser(
1112 ProfileManager::GetDefaultProfileOrOffTheRecord()); 1113 ProfileManager::GetDefaultProfileOrOffTheRecord());
1113 } 1114 }
1114 1115
1115 } // namespace chromeos 1116 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698