Index: chrome/browser/ui/webui/chromeos/network_ui.cc |
diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc |
index 6387b89017cb383f3f7ebf8b8f1d674819c07d9b..f0da5f18b23671e3805ea6b677b5b240a0187cc4 100644 |
--- a/chrome/browser/ui/webui/chromeos/network_ui.cc |
+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc |
@@ -12,7 +12,6 @@ |
#include "chrome/browser/ui/webui/chromeos/network_config_message_handler.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/grit/generated_resources.h" |
-#include "chromeos/network/network_event_log.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_ui.h" |
#include "content/public/browser/web_ui_data_source.h" |
@@ -21,65 +20,26 @@ |
namespace chromeos { |
-namespace { |
- |
-const int kMaxLogEvents = 1000; |
- |
-class NetworkUIMessageHandler : public content::WebUIMessageHandler { |
- public: |
- NetworkUIMessageHandler() {} |
- virtual ~NetworkUIMessageHandler() {} |
- |
- // WebUIMessageHandler implementation. |
- virtual void RegisterMessages() override { |
- web_ui()->RegisterMessageCallback( |
- "NetworkUI.getNetworkLog", |
- base::Bind(&NetworkUIMessageHandler::GetNetworkLog, |
- base::Unretained(this))); |
- } |
- |
- private: |
- void GetNetworkLog(const base::ListValue* value) const { |
- base::StringValue data(chromeos::device_event_log::GetAsString( |
- chromeos::device_event_log::NEWEST_FIRST, "json", "network,login", |
- chromeos::device_event_log::LOG_LEVEL_DEBUG, kMaxLogEvents)); |
- web_ui()->CallJavascriptFunction("NetworkUI.getNetworkLogCallback", data); |
- } |
- |
- DISALLOW_COPY_AND_ASSIGN(NetworkUIMessageHandler); |
-}; |
- |
-} // namespace |
- |
NetworkUI::NetworkUI(content::WebUI* web_ui) |
: content::WebUIController(web_ui) { |
web_ui->AddMessageHandler(new NetworkConfigMessageHandler()); |
- web_ui->AddMessageHandler(new NetworkUIMessageHandler()); |
content::WebUIDataSource* html = |
content::WebUIDataSource::Create(chrome::kChromeUINetworkHost); |
html->AddLocalizedString("titleText", IDS_NETWORK_TITLE); |
html->AddLocalizedString("autoRefreshText", IDS_NETWORK_AUTO_REFRESH); |
- html->AddLocalizedString("logRefreshText", IDS_NETWORK_LOG_REFRESH); |
- html->AddLocalizedString("logLevelShowText", IDS_NETWORK_LOG_LEVEL_SHOW); |
- html->AddLocalizedString("logLevelErrorText", IDS_NETWORK_LOG_LEVEL_ERROR); |
- html->AddLocalizedString("logLevelUserText", IDS_NETWORK_LOG_LEVEL_USER); |
- html->AddLocalizedString("logLevelEventText", IDS_NETWORK_LOG_LEVEL_EVENT); |
- html->AddLocalizedString("logLevelDebugText", IDS_NETWORK_LOG_LEVEL_DEBUG); |
- html->AddLocalizedString("logLevelFileinfoText", |
- IDS_NETWORK_LOG_LEVEL_FILEINFO); |
- html->AddLocalizedString("logLevelTimeDetailText", |
- IDS_NETWORK_LOG_LEVEL_TIME_DETAIL); |
- html->AddLocalizedString("logEntryFormat", IDS_NETWORK_LOG_ENTRY); |
+ html->AddLocalizedString("deviceLogLinkText", IDS_DEVICE_LOG_LINK_TEXT); |
+ html->AddLocalizedString("networkRefreshText", IDS_NETWORK_REFRESH); |
+ |
html->SetJsonPath("strings.js"); |
html->AddResourcePath("network_config.js", IDR_NETWORK_CONFIG_JS); |
html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS); |
html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS); |
html->SetDefaultResource(IDR_NETWORK_UI_HTML); |
- content::WebUIDataSource::Add( |
- web_ui->GetWebContents()->GetBrowserContext(), html); |
+ content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), |
+ html); |
} |
NetworkUI::~NetworkUI() { |