| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/browser_main.h" | 5 #include "chrome/browser/browser_main.h" | 
| 6 #include "chrome/browser/browser_main_win.h" | 6 #include "chrome/browser/browser_main_win.h" | 
| 7 | 7 | 
| 8 #include <windows.h> | 8 #include <windows.h> | 
| 9 #include <shellapi.h> | 9 #include <shellapi.h> | 
| 10 | 10 | 
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 127       parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) | 127       parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) | 
| 128     return; | 128     return; | 
| 129 | 129 | 
| 130   // The encoding we use for the info is "title|context|direction" where | 130   // The encoding we use for the info is "title|context|direction" where | 
| 131   // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending | 131   // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending | 
| 132   // on the current locale. | 132   // on the current locale. | 
| 133   string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); | 133   string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); | 
| 134   dlg_strings.push_back('|'); | 134   dlg_strings.push_back('|'); | 
| 135   string16 adjusted_string( | 135   string16 adjusted_string( | 
| 136       l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT)); | 136       l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT)); | 
| 137   base::i18n::AdjustStringForLocaleDirection(adjusted_string, &adjusted_string); | 137   base::i18n::AdjustStringForLocaleDirection(&adjusted_string); | 
| 138   dlg_strings.append(adjusted_string); | 138   dlg_strings.append(adjusted_string); | 
| 139   dlg_strings.push_back('|'); | 139   dlg_strings.push_back('|'); | 
| 140   dlg_strings.append(ASCIIToUTF16( | 140   dlg_strings.append(ASCIIToUTF16( | 
| 141       base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale)); | 141       base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale)); | 
| 142 | 142 | 
| 143   env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings)); | 143   env->SetVar(env_vars::kRestartInfo, UTF16ToUTF8(dlg_strings)); | 
| 144 } | 144 } | 
| 145 | 145 | 
| 146 // This method handles the --hide-icons and --show-icons command line options | 146 // This method handles the --hide-icons and --show-icons command line options | 
| 147 // for chrome that get triggered by Windows from registry entries | 147 // for chrome that get triggered by Windows from registry entries | 
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 241       base::EnsureNSPRInit(); | 241       base::EnsureNSPRInit(); | 
| 242     } | 242     } | 
| 243   } | 243   } | 
| 244 }; | 244 }; | 
| 245 | 245 | 
| 246 // static | 246 // static | 
| 247 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 247 BrowserMainParts* BrowserMainParts::CreateBrowserMainParts( | 
| 248     const MainFunctionParams& parameters) { | 248     const MainFunctionParams& parameters) { | 
| 249   return new BrowserMainPartsWin(parameters); | 249   return new BrowserMainPartsWin(parameters); | 
| 250 } | 250 } | 
| OLD | NEW | 
|---|