| Index: chrome/browser/chromeos/webui/network_menu_ui.cc
|
| diff --git a/chrome/browser/chromeos/webui/network_menu_ui.cc b/chrome/browser/chromeos/webui/network_menu_ui.cc
|
| deleted file mode 100644
|
| index e4553ab1ebc0f1225b886b8f2a35d40e1cf52c42..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/chromeos/webui/network_menu_ui.cc
|
| +++ /dev/null
|
| @@ -1,198 +0,0 @@
|
| -// Copyright (c) 2011 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/webui/network_menu_ui.h"
|
| -
|
| -#include "base/string_number_conversions.h"
|
| -#include "base/string_util.h"
|
| -#include "base/values.h"
|
| -#include "chrome/app/chrome_command_ids.h"
|
| -#include "chrome/browser/chromeos/status/network_menu.h"
|
| -#include "chrome/browser/chromeos/views/native_menu_webui.h"
|
| -#include "chrome/browser/chromeos/views/webui_menu_widget.h"
|
| -#include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/ui/webui/theme_source.h"
|
| -#include "chrome/common/url_constants.h"
|
| -#include "content/browser/browser_thread.h"
|
| -#include "content/browser/tab_contents/tab_contents.h"
|
| -#include "googleurl/src/gurl.h"
|
| -#include "grit/browser_resources.h"
|
| -#include "grit/generated_resources.h"
|
| -#include "ui/base/l10n/l10n_util.h"
|
| -#include "views/controls/menu/menu_2.h"
|
| -
|
| -namespace {
|
| -
|
| -class NetworkMenuSourceDelegate : public chromeos::MenuSourceDelegate {
|
| - public:
|
| - virtual void AddLocalizedStrings(DictionaryValue* localized_strings) const {
|
| - DCHECK(localized_strings);
|
| -
|
| - localized_strings->SetString("reconnect", l10n_util::GetStringUTF16(
|
| - IDS_NETWORK_RECONNECT_TITLE));
|
| - localized_strings->SetString("auto_connect_this_network",
|
| - l10n_util::GetStringUTF16(
|
| - IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
|
| - localized_strings->SetString("ssid_prompt",
|
| - l10n_util::GetStringUTF16(IDS_NETWORK_SSID_HINT));
|
| - localized_strings->SetString("pass_prompt",
|
| - l10n_util::GetStringUTF16(IDS_NETWORK_PASSWORD_HINT));
|
| - }
|
| -};
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -//
|
| -// MenuHandler
|
| -//
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -
|
| -// The handler for Javascript messages related to the "system" view.
|
| -class NetworkMenuHandler : public chromeos::MenuHandlerBase,
|
| - public base::SupportsWeakPtr<NetworkMenuHandler> {
|
| - public:
|
| - NetworkMenuHandler();
|
| - virtual ~NetworkMenuHandler();
|
| -
|
| - // WebUIMessageHandler implementation.
|
| - virtual void RegisterMessages();
|
| -
|
| - private:
|
| - void HandleAction(const ListValue* values);
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(NetworkMenuHandler);
|
| -};
|
| -
|
| -void NetworkMenuHandler::RegisterMessages() {
|
| - web_ui_->RegisterMessageCallback(
|
| - "action",
|
| - NewCallback(this,
|
| - &NetworkMenuHandler::HandleAction));
|
| -}
|
| -
|
| -void NetworkMenuHandler::HandleAction(const ListValue* values) {
|
| - ui::MenuModel* model = GetMenuModel();
|
| - if (model) {
|
| - chromeos::NetworkMenuUI* network_menu_ui =
|
| - static_cast<chromeos::NetworkMenuUI*>(web_ui_);
|
| - bool close_menu = network_menu_ui->ModelAction(model, values);
|
| - if (close_menu) {
|
| - chromeos::WebUIMenuWidget* widget
|
| - = chromeos::WebUIMenuWidget::FindWebUIMenuWidget(
|
| - web_ui_->tab_contents()->GetNativeView());
|
| - if (widget) {
|
| - chromeos::NativeMenuWebUI* webui_menu = widget->webui_menu();
|
| - if (webui_menu)
|
| - webui_menu->Hide();
|
| - }
|
| - }
|
| - }
|
| -}
|
| -
|
| -NetworkMenuHandler::NetworkMenuHandler() {
|
| -}
|
| -
|
| -NetworkMenuHandler::~NetworkMenuHandler() {
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -namespace chromeos {
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -//
|
| -// NetworkMenuUI
|
| -//
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -
|
| -NetworkMenuUI::NetworkMenuUI(TabContents* contents)
|
| - : chromeos::MenuUI(
|
| - contents,
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - CreateMenuUIHTMLSource(new NetworkMenuSourceDelegate(),
|
| - chrome::kChromeUINetworkMenu,
|
| - "NetworkMenu",
|
| - IDR_NETWORK_MENU_JS,
|
| - IDR_NETWORK_MENU_CSS))) {
|
| - NetworkMenuHandler* handler = new NetworkMenuHandler();
|
| - AddMessageHandler((handler)->Attach(this));
|
| -
|
| - // Set up chrome://theme/ source.
|
| - ThemeSource* theme = new ThemeSource(contents->profile());
|
| - contents->profile()->GetChromeURLDataManager()->AddDataSource(theme);
|
| -}
|
| -
|
| -bool NetworkMenuUI::ModelAction(const ui::MenuModel* model,
|
| - const ListValue* values) {
|
| - const NetworkMenu* network_menu = static_cast<const NetworkMenu*>(model);
|
| - std::string action;
|
| - bool success = values->GetString(0, &action);
|
| - bool close_menu = true;
|
| - if (!success) {
|
| - LOG(WARNING) << "ModelAction called with no arguments from: "
|
| - << chrome::kChromeUINetworkMenu;
|
| - return close_menu;
|
| - }
|
| - int index;
|
| - std::string index_str;
|
| - success = values->GetString(1, &index_str);
|
| - success = success && base::StringToInt(index_str, &index);
|
| - if (!success) {
|
| - LOG(WARNING) << "ModelAction called with no index from: "
|
| - << chrome::kChromeUINetworkMenu;
|
| - return close_menu;
|
| - }
|
| - std::string passphrase;
|
| - values->GetString(2, &passphrase); // Optional
|
| - std::string ssid;
|
| - values->GetString(3, &ssid); // Optional
|
| - int auto_connect = -1; // -1 indicates default action (auto connect)
|
| - std::string auto_connect_str;
|
| - if (values->GetString(4, &auto_connect_str)) // Optional
|
| - base::StringToInt(auto_connect_str, &auto_connect);
|
| -
|
| - if (action == "connect" || action == "reconnect") {
|
| - close_menu = network_menu->ConnectToNetworkAt(index, passphrase, ssid,
|
| - auto_connect);
|
| - } else {
|
| - LOG(WARNING) << "Unrecognized action: " << action
|
| - << " from: " << chrome::kChromeUINetworkMenu;
|
| - }
|
| - return close_menu;
|
| -}
|
| -
|
| -DictionaryValue* NetworkMenuUI::CreateMenuItem(const ui::MenuModel* model,
|
| - int index,
|
| - const char* type,
|
| - int* max_icon_width,
|
| - bool* has_accel) const {
|
| - // Create a MenuUI menu item, then append network specific values.
|
| - DictionaryValue* item = MenuUI::CreateMenuItem(model,
|
| - index,
|
| - type,
|
| - max_icon_width,
|
| - has_accel);
|
| - // Network menu specific values.
|
| - const NetworkMenu* network_menu = static_cast<const NetworkMenu*>(model);
|
| - NetworkMenu::NetworkInfo info;
|
| - bool found = network_menu->GetNetworkAt(index, &info);
|
| -
|
| - item->SetBoolean("visible", found);
|
| - item->SetString("network_type", info.network_type);
|
| - item->SetString("status", info.status);
|
| - item->SetString("message", info.message);
|
| - item->SetString("ip_address", info.ip_address);
|
| - item->SetString("passphrase", info.passphrase);
|
| - item->SetBoolean("need_passphrase", info.need_passphrase);
|
| - item->SetBoolean("remembered", info.remembered);
|
| - return item;
|
| -}
|
| -
|
| -views::Menu2* NetworkMenuUI::CreateMenu2(ui::MenuModel* model) {
|
| - views::Menu2* menu = new views::Menu2(model);
|
| - NativeMenuWebUI::SetMenuURL(
|
| - menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));
|
| - return menu;
|
| -}
|
| -
|
| -} // namespace chromeos
|
|
|