mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix code styling problems

Browse source
This commit is contained in:
Cheng Zhao 2016-05-05 12:26:23 +09:00
parent 3f2a25d07c
commit 7268f434b2
9 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
atom/browser/api/atom_api_app.cc
View file

@ -250,11 +250,14 @@ void App::OnFinishLaunching() {
Emit("ready");
}
void App::OnContinueUserActivity(bool* prevent_default,
const std::string& type,
const std::map<std::string, std::string>& user_info) {
#if defined(OS_MACOSX)
void App::OnContinueUserActivity(
bool* prevent_default,
const std::string& type,
const std::map<std::string, std::string>& user_info) {
*prevent_default = Emit("continue-activity", type, user_info);
}
#endif
void App::OnLogin(LoginHandler* login_handler) {
v8::Locker locker(isolate());

9
atom/browser/api/atom_api_app.h
View file

@ -72,9 +72,12 @@ class App : public AtomBrowserClient::Delegate,
void OnWillFinishLaunching() override;
void OnFinishLaunching() override;
void OnLogin(LoginHandler* login_handler) override;
void OnContinueUserActivity(bool* prevent_default,
const std::string& type,
const std::map<std::string, std::string>& user_info) override;
#if defined(OS_MACOSX)
void OnContinueUserActivity(
bool* prevent_default,
const std::string& type,
const std::map<std::string, std::string>& user_info) override;
#endif
// content::ContentBrowserClient:
void AllowCertificateError(