| OLD | NEW |
| 1 // Copyright (c) 2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2008 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 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 if (![NSApp isKindOfClass:[CrApplication class]]) { | 35 if (![NSApp isKindOfClass:[CrApplication class]]) { |
| 36 LOG(ERROR) << "NSApp should be of type CrApplication, not " | 36 LOG(ERROR) << "NSApp should be of type CrApplication, not " |
| 37 << [[NSApp className] UTF8String]; | 37 << [[NSApp className] UTF8String]; |
| 38 DCHECK(false) << "NSApp is of wrong type"; | 38 DCHECK(false) << "NSApp is of wrong type"; |
| 39 } | 39 } |
| 40 | 40 |
| 41 // Before we load the nib, we need to start up the resource bundle so we have | 41 // Before we load the nib, we need to start up the resource bundle so we have |
| 42 // the strings avaiable for localization. | 42 // the strings avaiable for localization. |
| 43 if (!parameters.ui_task) { | 43 if (!parameters.ui_task) { |
| 44 ResourceBundle::InitSharedInstance(std::wstring()); | 44 ResourceBundle::InitSharedInstance(std::wstring()); |
| 45 // We only load the theme resources in the browser process, since this is | |
| 46 // the browser process, load them. | |
| 47 ResourceBundle::GetSharedInstance().LoadThemeResources(); | |
| 48 } | 45 } |
| 49 // Now load the nib. | 46 // Now load the nib. |
| 50 [NSBundle loadNibNamed:@"MainMenu" owner:NSApp]; | 47 [NSBundle loadNibNamed:@"MainMenu" owner:NSApp]; |
| 51 | 48 |
| 52 // This is a no-op if the KeystoneRegistration framework is not present. | 49 // This is a no-op if the KeystoneRegistration framework is not present. |
| 53 // The framework is only distributed with branded Google Chrome builds. | 50 // The framework is only distributed with branded Google Chrome builds. |
| 54 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; | 51 [[KeystoneGlue defaultKeystoneGlue] registerWithKeystone]; |
| 55 } | 52 } |
| 56 | 53 |
| 57 void DidEndMainMessageLoop() { | 54 void DidEndMainMessageLoop() { |
| (...skipping 25 matching lines...) Expand all Loading... |
| 83 int HandleIconsCommands(const CommandLine& parsed_command_line) { | 80 int HandleIconsCommands(const CommandLine& parsed_command_line) { |
| 84 return 0; | 81 return 0; |
| 85 } | 82 } |
| 86 | 83 |
| 87 bool CheckMachineLevelInstall() { | 84 bool CheckMachineLevelInstall() { |
| 88 return false; | 85 return false; |
| 89 } | 86 } |
| 90 | 87 |
| 91 void PrepareRestartOnCrashEnviroment(const CommandLine& parsed_command_line) { | 88 void PrepareRestartOnCrashEnviroment(const CommandLine& parsed_command_line) { |
| 92 } | 89 } |
| OLD | NEW |