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

Unified Diff: chrome/common/resource_bundle.cc

Issue 100046: More linux ifdef tweaks. This reverts my earlier change (13503).... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 | « chrome/common/resource_bundle.h ('k') | chrome/common/resource_bundle_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/resource_bundle.cc
===================================================================
--- chrome/common/resource_bundle.cc (revision 14606)
+++ chrome/common/resource_bundle.cc (working copy)
@@ -52,9 +52,7 @@
}
void ResourceBundle::SetThemeExtension(const Extension& e) {
-#if !defined(LINUX2)
theme_extension_.reset(new Extension(e));
-#endif
}
/* static */
@@ -65,7 +63,6 @@
// it can handle this resource.
// TODO(erikkay): It would be nice to use something less brittle than
// resource_id here.
-#if !defined(LINUX2)
if (g_shared_instance_->theme_extension_.get()) {
FilePath path =
g_shared_instance_->theme_extension_->GetThemeResourcePath(resource_id);
@@ -87,7 +84,6 @@
}
}
}
-#endif
if (!success)
success = LoadResourceBytes(data_handle, resource_id, &raw_data);
if (!success)
« no previous file with comments | « chrome/common/resource_bundle.h ('k') | chrome/common/resource_bundle_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698