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

Side by Side Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 2561963002: base: Remove the string logging from CHECK(). (Closed)
Patch Set: checkstring: rebase Created 4 years 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
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_mac.h" 5 #include "chrome/browser/chrome_browser_main_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 } 106 }
107 107
108 // Before we load the nib, we need to start up the resource bundle so we 108 // Before we load the nib, we need to start up the resource bundle so we
109 // have the strings avaiable for localization. 109 // have the strings avaiable for localization.
110 // TODO(markusheintz): Read preference pref::kApplicationLocale in order 110 // TODO(markusheintz): Read preference pref::kApplicationLocale in order
111 // to enforce the application locale. 111 // to enforce the application locale.
112 const std::string loaded_locale = 112 const std::string loaded_locale =
113 ui::ResourceBundle::InitSharedInstanceWithLocale( 113 ui::ResourceBundle::InitSharedInstanceWithLocale(
114 std::string(), &resource_delegate_, 114 std::string(), &resource_delegate_,
115 ui::ResourceBundle::LOAD_COMMON_RESOURCES); 115 ui::ResourceBundle::LOAD_COMMON_RESOURCES);
116 CHECK(!loaded_locale.empty()) << "Default locale could not be found"; 116 // Default locale could not be found
117 CHECK(!loaded_locale.empty());
117 118
118 base::FilePath resources_pack_path; 119 base::FilePath resources_pack_path;
119 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path); 120 PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
120 ResourceBundle::GetSharedInstance().AddDataPackFromPath( 121 ResourceBundle::GetSharedInstance().AddDataPackFromPath(
121 resources_pack_path, ui::SCALE_FACTOR_NONE); 122 resources_pack_path, ui::SCALE_FACTOR_NONE);
122 123
123 // This is a no-op if the KeystoneRegistration framework is not present. 124 // This is a no-op if the KeystoneRegistration framework is not present.
124 // The framework is only distributed with branded Google Chrome builds. 125 // The framework is only distributed with branded Google Chrome builds.
125 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; 126 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone];
126 127
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 [glue updateProfileCountsWithNumProfiles:0 199 [glue updateProfileCountsWithNumProfiles:0
199 numSignedInProfiles:0]; 200 numSignedInProfiles:0];
200 } 201 }
201 } 202 }
202 203
203 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { 204 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
204 AppController* appController = 205 AppController* appController =
205 base::mac::ObjCCastStrict<AppController>([NSApp delegate]); 206 base::mac::ObjCCastStrict<AppController>([NSApp delegate]);
206 [appController didEndMainMessageLoop]; 207 [appController didEndMainMessageLoop];
207 } 208 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698