Upstream version 10.39.225.0

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

diff --git a/src/chrome/browser/ui/webui/about_ui.cc b/src/chrome/browser/ui/webui/about_ui.cc
index 1e76015..4e6e81a 100644 (file)
--- a/src/chrome/browser/ui/webui/about_ui.cc
+++ b/src/chrome/browser/ui/webui/about_ui.cc
@@ -13,7 +13,7 @@
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/i18n/number_formatting.h"
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
@@ -36,9 +36,11 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
+#include "chrome/grit/locale_settings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -48,9 +50,6 @@
 #include "content/public/common/process_type.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "grit/browser_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "grit/locale_settings.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
 #include "net/base/load_flags.h"
@@ -80,7 +79,6 @@
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
-#include "chromeos/chromeos_switches.h"
 #endif
 
 using base::Time;
@@ -707,7 +705,7 @@ std::string AboutStats(const std::string& query) {
           base::JSONWriter::OPTIONS_PRETTY_PRINT,
           &data);
     if (query == kStringsJsPath)
-      data = "var templateData = " + data + ";";
+      data = "loadTimeData.data = " + data + ";";
   } else if (query == "raw") {
     // Dump the raw counters which have changed in text format.
     data = "<pre>";
@@ -1007,8 +1005,10 @@ void AboutUIHTMLSource::StartDataRequest(
     int idr = IDR_CREDITS_HTML;
     if (path == kCreditsJsPath)
       idr = IDR_CREDITS_JS;
+#if defined(OS_CHROMEOS)
     else if (path == kKeyboardUtilsPath)
       idr = IDR_KEYBOARD_UTILS_JS;
+#endif
 
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
         idr).as_string();