Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / media / webrtc_logs_ui.cc

diff --git a/src/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/src/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
index b1a9004..e5b0a57 100644 (file)
--- a/src/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
+++ b/src/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -19,16 +19,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/upload_list.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/generated_resources.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/theme_resources.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -42,7 +39,6 @@ namespace {
 content::WebUIDataSource* CreateWebRtcLogsUIHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUIWebRtcLogsHost);
-  source->SetUseJsonJSFormatV2();
 
   source->AddLocalizedString("webrtcLogsTitle", IDS_WEBRTC_LOGS_TITLE);
   source->AddLocalizedString("webrtcLogCountFormat",
@@ -81,13 +77,13 @@ class WebRtcLogsDOMHandler : public WebUIMessageHandler,
                              public UploadList::Delegate {
  public:
   explicit WebRtcLogsDOMHandler(Profile* profile);
-  virtual ~WebRtcLogsDOMHandler();
+  ~WebRtcLogsDOMHandler() override;
 
   // WebUIMessageHandler implementation.
-  virtual void RegisterMessages() OVERRIDE;
+  void RegisterMessages() override;
 
   // UploadList::Delegate implemenation.
-  virtual void OnUploadListAvailable() OVERRIDE;
+  void OnUploadListAvailable() override;
 
  private:
   // Asynchronously fetches the list of upload WebRTC logs. Called from JS.