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

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

Issue 14109008: Suppress CHECK failure in CreateProfile for OS_WIN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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) 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.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 user_data_dir); 355 user_data_dir);
356 #else 356 #else
357 base::FilePath profile_path = 357 base::FilePath profile_path =
358 GetStartupProfilePath(user_data_dir, parsed_command_line); 358 GetStartupProfilePath(user_data_dir, parsed_command_line);
359 profile = g_browser_process->profile_manager()->GetProfile( 359 profile = g_browser_process->profile_manager()->GetProfile(
360 profile_path); 360 profile_path);
361 #endif 361 #endif
362 if (profile) 362 if (profile)
363 return profile; 363 return profile;
364 364
365 #if !defined(OS_WIN)
365 // TODO(port): fix this. See comments near the definition of 366 // TODO(port): fix this. See comments near the definition of
366 // user_data_dir. It is better to CHECK-fail here than it is to 367 // user_data_dir. It is better to CHECK-fail here than it is to
367 // silently exit because of missing code in the above test. 368 // silently exit because of missing code in the above test.
368 CHECK(profile) << "Cannot get default profile."; 369 CHECK(profile) << "Cannot get default profile.";
370 #endif
369 371
370 return NULL; 372 return NULL;
371 } 373 }
372 374
373 #if defined(OS_MACOSX) 375 #if defined(OS_MACOSX)
374 OSStatus KeychainCallback(SecKeychainEvent keychain_event, 376 OSStatus KeychainCallback(SecKeychainEvent keychain_event,
375 SecKeychainCallbackInfo* info, void* context) { 377 SecKeychainCallbackInfo* info, void* context) {
376 return noErr; 378 return noErr;
377 } 379 }
378 #endif 380 #endif
(...skipping 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1725 if (base::win::GetVersion() <= base::win::VERSION_XP) 1727 if (base::win::GetVersion() <= base::win::VERSION_XP)
1726 uma_name += "_XP"; 1728 uma_name += "_XP";
1727 1729
1728 uma_name += "_PreRead_"; 1730 uma_name += "_PreRead_";
1729 uma_name += pre_read_percentage; 1731 uma_name += pre_read_percentage;
1730 AddPreReadHistogramTime(uma_name.c_str(), time); 1732 AddPreReadHistogramTime(uma_name.c_str(), time);
1731 } 1733 }
1732 #endif 1734 #endif
1733 #endif 1735 #endif
1734 } 1736 }
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