| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chrome_browser_main_win.h" | 5 #include "chrome/browser/chrome_browser_main_win.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <stddef.h> | 9 #include <stddef.h> |
| 10 | 10 |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 // setup.exe. In Chrome, these strings are in the locale files. | 311 // setup.exe. In Chrome, these strings are in the locale files. |
| 312 SetupInstallerUtilStrings(); | 312 SetupInstallerUtilStrings(); |
| 313 | 313 |
| 314 ChromeBrowserMainParts::PreMainMessageLoopStart(); | 314 ChromeBrowserMainParts::PreMainMessageLoopStart(); |
| 315 if (!parameters().ui_task) { | 315 if (!parameters().ui_task) { |
| 316 // Make sure that we know how to handle exceptions from the message loop. | 316 // Make sure that we know how to handle exceptions from the message loop. |
| 317 InitializeWindowProcExceptions(); | 317 InitializeWindowProcExceptions(); |
| 318 } | 318 } |
| 319 } | 319 } |
| 320 | 320 |
| 321 int ChromeBrowserMainPartsWin::PreCreateThreads() { | 321 int ChromeBrowserMainPartsWin::PreCreateThreadsBegin() { |
| 322 int rv = ChromeBrowserMainParts::PreCreateThreads(); | 322 int rv = ChromeBrowserMainParts::PreCreateThreadsBegin(); |
| 323 | 323 |
| 324 // TODO(viettrungluu): why don't we run this earlier? | 324 // TODO(viettrungluu): why don't we run this earlier? |
| 325 if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) && | 325 if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) && |
| 326 base::win::GetVersion() < base::win::VERSION_XP) { | 326 base::win::GetVersion() < base::win::VERSION_XP) { |
| 327 chrome::ShowMessageBox(NULL, | 327 chrome::ShowMessageBox(NULL, |
| 328 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), | 328 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), |
| 329 l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP), | 329 l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP), |
| 330 chrome::MESSAGE_BOX_TYPE_WARNING); | 330 chrome::MESSAGE_BOX_TYPE_WARNING); |
| 331 } | 331 } |
| 332 | 332 |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 574 if (resource_id) | 574 if (resource_id) |
| 575 return l10n_util::GetStringUTF16(resource_id); | 575 return l10n_util::GetStringUTF16(resource_id); |
| 576 return base::string16(); | 576 return base::string16(); |
| 577 } | 577 } |
| 578 | 578 |
| 579 // static | 579 // static |
| 580 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { | 580 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { |
| 581 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); | 581 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); |
| 582 installer::SetTranslationDelegate(&delegate); | 582 installer::SetTranslationDelegate(&delegate); |
| 583 } | 583 } |
| OLD | NEW |