| Index: ui/base/resource/resource_bundle_auralinux.cc
|
| diff --git a/ui/base/resource/resource_bundle_auralinux.cc b/ui/base/resource/resource_bundle_auralinux.cc
|
| index 128fd6762d279d647ded69aa73bf69d1c769ac77..04c8d918728d0f1e9c95c7cdce358b86edff1471 100644
|
| --- a/ui/base/resource/resource_bundle_auralinux.cc
|
| +++ b/ui/base/resource/resource_bundle_auralinux.cc
|
| @@ -4,44 +4,10 @@
|
|
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -#include "base/command_line.h"
|
| #include "base/logging.h"
|
| -#include "base/path_service.h"
|
| -#include "ui/base/layout.h"
|
| -#include "ui/base/resource/resource_handle.h"
|
| -#include "ui/base/ui_base_paths.h"
|
| -#include "ui/base/ui_base_switches.h"
|
| -#include "ui/gfx/display.h"
|
| -#include "ui/gfx/image/image.h"
|
| -
|
| -namespace {
|
| -
|
| -base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
|
| - base::FilePath path;
|
| - if (PathService::Get(base::DIR_MODULE, &path))
|
| - return path.AppendASCII(pak_name.c_str());
|
| -
|
| - // Return just the name of the pack file.
|
| - return base::FilePath(pak_name.c_str());
|
| -}
|
| -
|
| -} // namespace
|
|
|
| namespace ui {
|
|
|
| -void ResourceBundle::LoadCommonResources() {
|
| - // Always load the 1x data pack first as the 2x data pack contains both 1x and
|
| - // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
|
| - // scale factor to gfx::ImageSkia::AddRepresentation.
|
| - AddDataPackFromPath(GetResourcesPakFilePath(
|
| - "chrome_100_percent.pak"), SCALE_FACTOR_100P);
|
| -
|
| - if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
|
| - AddOptionalDataPackFromPath(GetResourcesPakFilePath(
|
| - "chrome_200_percent.pak"), SCALE_FACTOR_200P);
|
| - }
|
| -}
|
| -
|
| gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
|
| // Flipped image is not used on ChromeOS.
|
| DCHECK_EQ(rtl, RTL_DISABLED);
|
|
|