diff options
Diffstat (limited to 'chrome/browser/ui/webui/about_ui.cc')
| -rw-r--r-- | chrome/browser/ui/webui/about_ui.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 7d7fce2..bdbeea1 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -58,7 +58,6 @@ #include "net/base/escape.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #if defined(ENABLE_THEMES) @@ -713,8 +712,7 @@ void FinishMemoryDataRequest(const std::string& path, source->FinishDataRequest( ResourceBundle::GetSharedInstance().GetRawDataResource( path == kMemoryJsPath ? IDR_ABOUT_MEMORY_JS : - IDR_ABOUT_MEMORY_HTML, - ui::SCALE_FACTOR_NONE).as_string(), request_id); + IDR_ABOUT_MEMORY_HTML).as_string(), request_id); } } @@ -865,8 +863,8 @@ std::string AboutStats(const std::string& query) { } else { // Get about_stats.html/js from resource bundle. data = ResourceBundle::GetSharedInstance().GetRawDataResource( - (query == kStatsJsPath ? IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML), - ui::SCALE_FACTOR_NONE).as_string(); + (query == kStatsJsPath ? + IDR_ABOUT_STATS_JS : IDR_ABOUT_STATS_HTML)).as_string(); if (query != kStatsJsPath) { // Clear the timer list since we stored the data in the timers list @@ -1115,7 +1113,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path, } else if (host == chrome::kChromeUICreditsHost) { int idr = (path == kCreditsJsPath) ? IDR_CREDITS_JS : IDR_CREDITS_HTML; response = ResourceBundle::GetSharedInstance().GetRawDataResource( - idr, ui::SCALE_FACTOR_NONE).as_string(); + idr).as_string(); #if defined(OS_CHROMEOS) } else if (host == chrome::kChromeUIDiscardsHost) { response = AboutDiscards(path); @@ -1141,7 +1139,7 @@ void AboutUIHTMLSource::StartDataRequest(const std::string& path, response = AboutNetwork(path); } else if (host == chrome::kChromeUIOSCreditsHost) { response = ResourceBundle::GetSharedInstance().GetRawDataResource( - IDR_OS_CREDITS_HTML, ui::SCALE_FACTOR_NONE).as_string(); + IDR_OS_CREDITS_HTML).as_string(); #endif #if defined(OS_LINUX) || defined(OS_OPENBSD) } else if (host == chrome::kChromeUISandboxHost) { |