Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / startup / bad_flags_prompt.cc

diff --git a/src/chrome/browser/ui/startup/bad_flags_prompt.cc b/src/chrome/browser/ui/startup/bad_flags_prompt.cc
index 4ce4ea1..f924efd 100644 (file)
--- a/src/chrome/browser/ui/startup/bad_flags_prompt.cc
+++ b/src/chrome/browser/ui/startup/bad_flags_prompt.cc
@@ -43,7 +43,9 @@ void ShowBadFlagsPrompt(Browser* browser) {
     switches::kDisableSeccompFilterSandbox,
     switches::kDisableSetuidSandbox,
     switches::kDisableWebSecurity,
+#if !defined(DISABLE_NACL)
     switches::kNaClDangerousNoSandboxNonSfi,
+#endif
     switches::kNoSandbox,
     switches::kSingleProcess,
 
@@ -104,7 +106,8 @@ void MaybeShowInvalidUserDataDirWarningDialog() {
     const char kUserDataDirDialogFallbackLocale[] = "en-US";
     if (locale.empty())
       locale = kUserDataDirDialogFallbackLocale;
-    ResourceBundle::InitSharedInstanceWithLocale(locale, NULL);
+    ui::ResourceBundle::InitSharedInstanceWithLocale(
+        locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
   }
 
   const base::string16& title =