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

Unified Diff: content/shell/app/shell_main_delegate.cc

Issue 316373003: Remove base::kInvalidPlatformFileValue from Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « content/renderer/pepper/ppb_broker_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 97ea71a8ecd31ccefd34a2fb776f7cba2ad6bfa4..773e0ae8d4b0dbd8120886c0991c548dd36e98c9 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -12,7 +12,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/path_service.h"
-#include "base/platform_file.h"
#include "cc/base/switches.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/common/content_switches.h"
@@ -263,7 +262,8 @@ void ShellMainDelegate::InitializeResourceBundle() {
// ResourceBundle pak at launch time.
int pak_fd =
base::GlobalDescriptors::GetInstance()->MaybeGet(kShellPakDescriptor);
- if (pak_fd != base::kInvalidPlatformFileValue) {
+ if (pak_fd >= 0) {
+ // This is clearly wrong. See crbug.com/330930
ui::ResourceBundle::InitSharedInstanceWithPakFile(base::File(pak_fd),
false);
ResourceBundle::GetSharedInstance().AddDataPackFromFile(
« no previous file with comments | « content/renderer/pepper/ppb_broker_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698