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

This is preventDefault by convention.

Browse source
This commit is contained in:
Charlie Hess 2016-04-29 22:08:19 -07:00
parent 88805ec7e2
commit 195940292d
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -250,10 +250,10 @@ void App::OnFinishLaunching() {
Emit("ready"); Emit("ready");
} }
void App::OnContinueUserActivity(bool* handled, void App::OnContinueUserActivity(bool* prevent_default,
const std::string& type, const std::string& type,
const std::map<std::string, std::string>& user_info) { const std::map<std::string, std::string>& user_info) {
*handled = Emit("continue-activity", type, user_info); *prevent_default = Emit("continue-activity", type, user_info);
} }
void App::OnLogin(LoginHandler* login_handler) { void App::OnLogin(LoginHandler* login_handler) {

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

@ -72,7 +72,7 @@ class App : public AtomBrowserClient::Delegate,
void OnWillFinishLaunching() override; void OnWillFinishLaunching() override;
void OnFinishLaunching() override; void OnFinishLaunching() override;
void OnLogin(LoginHandler* login_handler) override; void OnLogin(LoginHandler* login_handler) override;
void OnContinueUserActivity(bool* handled, void OnContinueUserActivity(bool* prevent_default,
const std::string& type, const std::string& type,
const std::map<std::string, std::string>& user_info) override; const std::map<std::string, std::string>& user_info) override;

6
atom/browser/browser.cc
View file

@ -141,12 +141,12 @@ void Browser::Activate(bool has_visible_windows) {
bool Browser::ContinueUserActivity(const std::string& type, bool Browser::ContinueUserActivity(const std::string& type,
const std::map<std::string, const std::map<std::string,
std::string>& user_info) { std::string>& user_info) {
bool handled = false; bool prevent_default = false;
FOR_EACH_OBSERVER(BrowserObserver, FOR_EACH_OBSERVER(BrowserObserver,
observers_, observers_,
OnContinueUserActivity(&handled, type, user_info)); OnContinueUserActivity(&prevent_default, type, user_info));
return handled; return prevent_default;
} }
#endif #endif

2
atom/browser/browser_observer.h
View file

@ -47,7 +47,7 @@ class BrowserObserver {
virtual void OnLogin(LoginHandler* login_handler) {} virtual void OnLogin(LoginHandler* login_handler) {}
// The browser wants to resume a user activity via handoff. (OS X only) // The browser wants to resume a user activity via handoff. (OS X only)
virtual void OnContinueUserActivity(bool* handled, virtual void OnContinueUserActivity(bool* prevent_default,
const std::string& type, const std::string& type,
const std::map<std::string, std::string>& user_info) {} const std::map<std::string, std::string>& user_info) {}