OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/logging.h" | 5 #include "base/logging.h" |
6 #include "base/mac_util.h" | 6 #include "base/mac/mac_util.h" |
7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
8 #include "base/sys_string_conversions.h" | 8 #include "base/sys_string_conversions.h" |
9 #include "base/time.h" | 9 #include "base/time.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #import "chrome/browser/ui/cocoa/about_ipc_controller.h" | 11 #import "chrome/browser/ui/cocoa/about_ipc_controller.h" |
12 | 12 |
13 #if defined(IPC_MESSAGE_LOG_ENABLED) | 13 #if defined(IPC_MESSAGE_LOG_ENABLED) |
14 | 14 |
15 @implementation CocoaLogData | 15 @implementation CocoaLogData |
16 | 16 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 | 79 |
80 @implementation AboutIPCController | 80 @implementation AboutIPCController |
81 | 81 |
82 + (AboutIPCController*)sharedController { | 82 + (AboutIPCController*)sharedController { |
83 if (gSharedController == nil) | 83 if (gSharedController == nil) |
84 gSharedController = [[AboutIPCController alloc] init]; | 84 gSharedController = [[AboutIPCController alloc] init]; |
85 return gSharedController; | 85 return gSharedController; |
86 } | 86 } |
87 | 87 |
88 - (id)init { | 88 - (id)init { |
89 NSString* nibpath = [mac_util::MainAppBundle() pathForResource:@"AboutIPC" | 89 NSString* nibpath = [base::mac::MainAppBundle() pathForResource:@"AboutIPC" |
90 ofType:@"nib"]; | 90 ofType:@"nib"]; |
91 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { | 91 if ((self = [super initWithWindowNibPath:nibpath owner:self])) { |
92 // Default to all on | 92 // Default to all on |
93 appCache_ = view_ = utilityHost_ = viewHost_ = plugin_ = | 93 appCache_ = view_ = utilityHost_ = viewHost_ = plugin_ = |
94 npObject_ = devTools_ = pluginProcessing_ = userString1_ = | 94 npObject_ = devTools_ = pluginProcessing_ = userString1_ = |
95 userString2_ = userString3_ = YES; | 95 userString2_ = userString3_ = YES; |
96 } | 96 } |
97 return self; | 97 return self; |
98 } | 98 } |
99 | 99 |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 } | 190 } |
191 | 191 |
192 - (void)setDisplayViewMessages:(BOOL)display { | 192 - (void)setDisplayViewMessages:(BOOL)display { |
193 view_ = display; | 193 view_ = display; |
194 } | 194 } |
195 | 195 |
196 @end | 196 @end |
197 | 197 |
198 #endif // IPC_MESSAGE_LOG_ENABLED | 198 #endif // IPC_MESSAGE_LOG_ENABLED |
199 | 199 |
OLD | NEW |