refactor: rename the atom namespace to electron
This commit is contained in:
parent
8c4496a9c9
commit
34c4c8d508
531 changed files with 1456 additions and 1428 deletions
|
@ -48,7 +48,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
// We simply try to close the browser, which in turn will try to close the
|
||||
// windows. Termination can proceed if all windows are closed or window close
|
||||
// can be cancelled which will abort termination.
|
||||
atom::Browser::Get()->Quit();
|
||||
electron::Browser::Get()->Quit();
|
||||
}
|
||||
|
||||
- (void)setShutdownHandler:(base::Callback<bool()>)handler {
|
||||
|
@ -118,9 +118,9 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
std::string activity_type(
|
||||
base::SysNSStringToUTF8(userActivity.activityType));
|
||||
std::unique_ptr<base::DictionaryValue> user_info =
|
||||
atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
shouldWait =
|
||||
browser->UpdateUserActivityState(activity_type, *user_info) ? YES : NO;
|
||||
});
|
||||
|
@ -145,9 +145,9 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
std::string activity_type(
|
||||
base::SysNSStringToUTF8(userActivity.activityType));
|
||||
std::unique_ptr<base::DictionaryValue> user_info =
|
||||
atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
browser->UserActivityWasContinued(activity_type, *user_info);
|
||||
});
|
||||
[userActivity setNeedsSave:YES];
|
||||
|
@ -167,7 +167,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
|
||||
NSString* url =
|
||||
[[event paramDescriptorForKeyword:keyDirectObject] stringValue];
|
||||
atom::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
|
||||
electron::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
|
||||
}
|
||||
|
||||
- (bool)voiceOverEnabled {
|
||||
|
@ -199,11 +199,11 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
ax_state->DisableAccessibility();
|
||||
}
|
||||
|
||||
atom::Browser::Get()->OnAccessibilitySupportChanged();
|
||||
electron::Browser::Get()->OnAccessibilitySupportChanged();
|
||||
}
|
||||
|
||||
- (void)orderFrontStandardAboutPanel:(id)sender {
|
||||
atom::Browser::Get()->ShowAboutPanel();
|
||||
electron::Browser::Get()->ShowAboutPanel();
|
||||
}
|
||||
|
||||
- (void)addNativeEventProcessorObserver:
|
||||
|
|
|
@ -12,6 +12,6 @@
|
|||
}
|
||||
|
||||
// Sets the menu that will be returned in "applicationDockMenu:".
|
||||
- (void)setApplicationDockMenu:(atom::AtomMenuModel*)model;
|
||||
- (void)setApplicationDockMenu:(electron::AtomMenuModel*)model;
|
||||
|
||||
@end
|
||||
|
|
|
@ -42,7 +42,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
|
||||
@implementation AtomApplicationDelegate
|
||||
|
||||
- (void)setApplicationDockMenu:(atom::AtomMenuModel*)model {
|
||||
- (void)setApplicationDockMenu:(electron::AtomMenuModel*)model {
|
||||
menu_controller_.reset([[AtomMenuController alloc] initWithModel:model
|
||||
useDefaultAccelerator:NO]);
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
setBool:NO
|
||||
forKey:@"NSFullScreenMenuItemEverywhere"];
|
||||
|
||||
atom::Browser::Get()->WillFinishLaunching();
|
||||
electron::Browser::Get()->WillFinishLaunching();
|
||||
}
|
||||
|
||||
- (void)applicationDidFinishLaunching:(NSNotification*)notify {
|
||||
|
@ -62,10 +62,10 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
|
||||
if (user_notification.userInfo != nil) {
|
||||
std::unique_ptr<base::DictionaryValue> launch_info =
|
||||
atom::NSDictionaryToDictionaryValue(user_notification.userInfo);
|
||||
atom::Browser::Get()->DidFinishLaunching(*launch_info);
|
||||
electron::NSDictionaryToDictionaryValue(user_notification.userInfo);
|
||||
electron::Browser::Get()->DidFinishLaunching(*launch_info);
|
||||
} else {
|
||||
atom::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
|
||||
electron::Browser::Get()->DidFinishLaunching(base::DictionaryValue());
|
||||
}
|
||||
|
||||
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
||||
|
@ -88,12 +88,12 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
|
||||
- (BOOL)application:(NSApplication*)sender openFile:(NSString*)filename {
|
||||
std::string filename_str(base::SysNSStringToUTF8(filename));
|
||||
return atom::Browser::Get()->OpenFile(filename_str) ? YES : NO;
|
||||
return electron::Browser::Get()->OpenFile(filename_str) ? YES : NO;
|
||||
}
|
||||
|
||||
- (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
|
||||
hasVisibleWindows:(BOOL)flag {
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
browser->Activate(static_cast<bool>(flag));
|
||||
return flag;
|
||||
}
|
||||
|
@ -109,11 +109,11 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
restorationHandler {
|
||||
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
|
||||
std::unique_ptr<base::DictionaryValue> user_info =
|
||||
atom::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
electron::NSDictionaryToDictionaryValue(userActivity.userInfo);
|
||||
if (!user_info)
|
||||
return NO;
|
||||
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
return browser->ContinueUserActivity(activity_type, *user_info) ? YES : NO;
|
||||
}
|
||||
|
||||
|
@ -121,7 +121,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
willContinueUserActivityWithType:(NSString*)userActivityType {
|
||||
std::string activity_type(base::SysNSStringToUTF8(userActivityType));
|
||||
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
return browser->WillContinueUserActivity(activity_type) ? YES : NO;
|
||||
}
|
||||
|
||||
|
@ -132,12 +132,12 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
|
|||
std::string error_message(
|
||||
base::SysNSStringToUTF8([error localizedDescription]));
|
||||
|
||||
atom::Browser* browser = atom::Browser::Get();
|
||||
electron::Browser* browser = electron::Browser::Get();
|
||||
browser->DidFailToContinueUserActivity(activity_type, error_message);
|
||||
}
|
||||
|
||||
- (IBAction)newWindowForTab:(id)sender {
|
||||
atom::Browser::Get()->NewWindowForTab();
|
||||
electron::Browser::Get()->NewWindowForTab();
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
@ -14,7 +14,7 @@ class ListValue;
|
|||
class DictionaryValue;
|
||||
} // namespace base
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
NSArray* ListValueToNSArray(const base::ListValue& value);
|
||||
|
||||
|
@ -25,6 +25,6 @@ NSDictionary* DictionaryValueToNSDictionary(const base::DictionaryValue& value);
|
|||
std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
|
||||
NSDictionary* dict);
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
||||
#endif // SHELL_BROWSER_MAC_DICT_UTIL_H_
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "base/strings/sys_string_conversions.h"
|
||||
#include "base/values.h"
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
NSArray* ListValueToNSArray(const base::ListValue& value) {
|
||||
std::string json;
|
||||
|
@ -127,4 +127,4 @@ std::unique_ptr<base::DictionaryValue> NSDictionaryToDictionaryValue(
|
|||
return result;
|
||||
}
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue