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

Side by Side Diff: chrome/browser/browser_main.cc

Issue 7129046: Makes Chrome crash on start if we can't init the common controls. I'm (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 #endif 1010 #endif
1011 1011
1012 #if defined(OS_WIN) 1012 #if defined(OS_WIN)
1013 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont; 1013 gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont;
1014 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize; 1014 gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize;
1015 1015
1016 // Init common control sex. 1016 // Init common control sex.
1017 INITCOMMONCONTROLSEX config; 1017 INITCOMMONCONTROLSEX config;
1018 config.dwSize = sizeof(config); 1018 config.dwSize = sizeof(config);
1019 config.dwICC = ICC_WIN95_CLASSES; 1019 config.dwICC = ICC_WIN95_CLASSES;
1020 InitCommonControlsEx(&config); 1020 if (!InitCommonControlsEx(&config))
1021 LOG_GETLASTERROR(FATAL);
1021 #endif 1022 #endif
1022 } 1023 }
1023 1024
1024 #if defined(OS_CHROMEOS) 1025 #if defined(OS_CHROMEOS)
1025 1026
1026 // Class is used to login using passed username and password. 1027 // Class is used to login using passed username and password.
1027 // The instance will be deleted upon success or failure. 1028 // The instance will be deleted upon success or failure.
1028 class StubLogin : public chromeos::LoginStatusConsumer, 1029 class StubLogin : public chromeos::LoginStatusConsumer,
1029 public chromeos::LoginUtils::Delegate { 1030 public chromeos::LoginUtils::Delegate {
1030 public: 1031 public:
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
1970 #if defined(OS_CHROMEOS) 1971 #if defined(OS_CHROMEOS)
1971 // To be precise, logout (browser shutdown) is not yet done, but the 1972 // To be precise, logout (browser shutdown) is not yet done, but the
1972 // remaining work is negligible, hence we say LogoutDone here. 1973 // remaining work is negligible, hence we say LogoutDone here.
1973 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone", 1974 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
1974 false); 1975 false);
1975 chromeos::BootTimesLoader::Get()->WriteLogoutTimes(); 1976 chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
1976 #endif 1977 #endif
1977 TRACE_EVENT_END_ETW("BrowserMain", 0, 0); 1978 TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
1978 return result_code; 1979 return result_code;
1979 } 1980 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698