Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Unified Diff: ui/base/resource/resource_bundle_aurax11.cc

Issue 13985039: Rationalize linux vs x11 in ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix review / try issues Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/resource/resource_bundle_auralinux.cc ('k') | ui/gfx/pango_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_aurax11.cc
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
deleted file mode 100644
index 4bc7ee696659ceb1ceb2c64d3ee857b0bcbbf93e..0000000000000000000000000000000000000000
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#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.pak"),
- SCALE_FACTOR_NONE);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "chrome_100_percent.pak"), SCALE_FACTOR_100P);
-
- if (ui::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);
- return GetImageNamed(resource_id);
-}
-
-} // namespace ui
« no previous file with comments | « ui/base/resource/resource_bundle_auralinux.cc ('k') | ui/gfx/pango_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698