Redirected network details to options DOM UI page....

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/status/network_menu.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/command_line.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/url_constants.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/skbitmap_operations.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "net/base/escape.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenu
 
 // static
 const int NetworkMenu::kNumWifiImages = 9;
 
@@ skipping 36 matching lines @@
     *icon = menu_items_[index].icon;
     return true;
   }
   return false;
 }
 
 bool NetworkMenu::IsEnabledAt(int index) const {
   return !(menu_items_[index].flags & FLAG_DISABLED);
 }
 
+void NetworkMenu::ShowTabbedNetworkSettings(const Network& network) {
+  Browser* browser = BrowserList::GetLastActive();
+  if (!browser)
+    return;
+  std::string page = StringPrintf("%s?servicePath=%s&networkType=%d",
+      chrome::kInternetOptionsSubPage,
+      EscapeUrlEncodedData(network.service_path()).c_str(),
+      network.type());
+  browser->ShowOptionsTab(page);
+}
+
 void NetworkMenu::ActivatedAt(int index) {
   // When we are refreshing the menu, ignore menu item activation.
   if (refreshing_menu_)
     return;
 
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   int flags = menu_items_[index].flags;
   if (flags & FLAG_OPTIONS) {
     OpenButtonOptions();
   } else if (flags & FLAG_TOGGLE_ETHERNET) {
     cros->EnableEthernetNetworkDevice(!cros->ethernet_enabled());
   } else if (flags & FLAG_TOGGLE_WIFI) {
     cros->EnableWifiNetworkDevice(!cros->wifi_enabled());
   } else if (flags & FLAG_TOGGLE_CELLULAR) {
     cros->EnableCellularNetworkDevice(!cros->cellular_enabled());
   } else if (flags & FLAG_TOGGLE_OFFLINE) {
     cros->EnableOfflineMode(!cros->offline_mode());
   } else if (flags & FLAG_OTHER_NETWORK) {
     NetworkConfigView* view = new NetworkConfigView();
     view->set_browser_mode(IsBrowserMode());
     views::Window* window = views::Window::CreateChromeWindow(GetNativeWindow(),
                                                               gfx::Rect(),
                                                               view);
     window->SetIsAlwaysOnTop(true);
     window->Show();
     view->SetLoginTextfieldFocus();
   } else if (flags & FLAG_ETHERNET) {
     if (cros->ethernet_connected()) {
-      NetworkConfigView* view = new NetworkConfigView(cros->ethernet_network());
-      view->set_browser_mode(IsBrowserMode());
-      views::Window* window = views::Window::CreateChromeWindow(
-          GetNativeWindow(), gfx::Rect(), view);
-      window->SetIsAlwaysOnTop(true);
-      window->Show();
+      if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableTabbedOptions)) {
+        ShowTabbedNetworkSettings(cros->ethernet_network());
+      } else {
+        NetworkConfigView* view =
+            new NetworkConfigView(cros->ethernet_network());
+        view->set_browser_mode(IsBrowserMode());
+        views::Window* window = views::Window::CreateChromeWindow(
+            GetNativeWindow(), gfx::Rect(), view);
+        window->SetIsAlwaysOnTop(true);
+        window->Show();
+      }
     }
   } else if (flags & FLAG_WIFI) {
     WifiNetwork wifi;
     bool wifi_exists = cros->FindWifiNetworkByPath(
         menu_items_[index].wireless_path, &wifi);
     if (!wifi_exists) {
       // If we are attempting to connect to a network that no longer exists,
       // display a notification.
       // TODO(stevenjb): Show notification.
     } else if (wifi.name() == cros->wifi_name()) {
       if (cros->wifi_connected()) {
-        // If we are already connected, open the config dialog.
-        NetworkConfigView* view = new NetworkConfigView(wifi, false);
-        view->set_browser_mode(IsBrowserMode());
-        views::Window* window = views::Window::CreateChromeWindow(
-            GetNativeWindow(), gfx::Rect(), view);
-        window->SetIsAlwaysOnTop(true);
-        window->Show();
+        if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableTabbedOptions)) {
+          ShowTabbedNetworkSettings(wifi);
+        } else {
+          // If we are already connected, open the config dialog.
+          NetworkConfigView* view = new NetworkConfigView(wifi, false);
+          view->set_browser_mode(IsBrowserMode());
+          views::Window* window = views::Window::CreateChromeWindow(
+              GetNativeWindow(), gfx::Rect(), view);
+          window->SetIsAlwaysOnTop(true);
+          window->Show();
+        }
       } else {
         // TODO(stevenjb): Connection in progress. Show dialog?
       }
     } else {
       // If wifi network is not encrypted, then directly connect.
       // Otherwise, we open password dialog window.
       if (!wifi.encrypted()) {
         cros->ConnectToWifiNetwork(wifi, std::string(),
                                    std::string(), std::string());
       } else {
@@ skipping 12 matching lines @@
         menu_items_[index].wireless_path, &cellular);
 
     if (!cellular_exists) {
       // If we are attempting to connect to a network that no longer exists,
       // display a notification.
       // TODO(stevenjb): Show notification.
     } else if (cellular.name() == cros->cellular_name()) {
       // If clicked on a network that we are already connected to or we are
       // currently trying to connect to, then open config dialog.
       if (cros->cellular_connected()) {
-        NetworkConfigView* view = new NetworkConfigView(cellular);
-        view->set_browser_mode(IsBrowserMode());
-        views::Window* window = views::Window::CreateChromeWindow(
-            GetNativeWindow(), gfx::Rect(), view);
-        window->SetIsAlwaysOnTop(true);
-        window->Show();
+        if (CommandLine::ForCurrentProcess()->HasSwitch(
+            switches::kEnableTabbedOptions)) {
+          ShowTabbedNetworkSettings(cellular);
+        } else {
+          NetworkConfigView* view = new NetworkConfigView(cellular);
+          view->set_browser_mode(IsBrowserMode());
+          views::Window* window = views::Window::CreateChromeWindow(
+              GetNativeWindow(), gfx::Rect(), view);
+          window->SetIsAlwaysOnTop(true);
+          window->Show();
+        }
       } else {
         // TODO(stevenjb): Connection in progress. Show dialog?
       }
     } else {
       cros->ConnectToCellularNetwork(cellular);
     }
   }
 }
 
 void NetworkMenu::SetFirstLevelMenuWidth(int width) {
@@ skipping 188 matching lines @@
     if (ShouldOpenButtonOptions()) {
       label =
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
           SkBitmap(), std::string(), FLAG_OPTIONS));
     }
   }
 }
 
 }  // namespace chromeos