| 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(
|
|
|