From 195940292d2ba649e9ea840119fb5d84bdba4ce8 Mon Sep 17 00:00:00 2001
From: Charlie Hess <charlie@slack-corp.com>
Date: Fri, 29 Apr 2016 22:08:19 -0700
Subject: [PATCH] This is preventDefault by convention.

---
 atom/browser/api/atom_api_app.cc | 4 ++--
 atom/browser/api/atom_api_app.h  | 2 +-
 atom/browser/browser.cc          | 6 +++---
 atom/browser/browser_observer.h  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc
index 0e2a6e5..ec6cdce 100644
--- a/atom/browser/api/atom_api_app.cc
+++ b/atom/browser/api/atom_api_app.cc
@@ -250,10 +250,10 @@ void App::OnFinishLaunching() {
   Emit("ready");
 }
 
-void App::OnContinueUserActivity(bool* handled,
+void App::OnContinueUserActivity(bool* prevent_default,
   const std::string& type,
   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) {
diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h
index 3a13322..321230d 100644
--- a/atom/browser/api/atom_api_app.h
+++ b/atom/browser/api/atom_api_app.h
@@ -72,7 +72,7 @@ class App : public AtomBrowserClient::Delegate,
   void OnWillFinishLaunching() override;
   void OnFinishLaunching() override;
   void OnLogin(LoginHandler* login_handler) override;
-  void OnContinueUserActivity(bool* handled,
+  void OnContinueUserActivity(bool* prevent_default,
     const std::string& type,
     const std::map<std::string, std::string>& user_info) override;
 
diff --git a/atom/browser/browser.cc b/atom/browser/browser.cc
index 1598019..ee2a225 100644
--- a/atom/browser/browser.cc
+++ b/atom/browser/browser.cc
@@ -141,12 +141,12 @@ void Browser::Activate(bool has_visible_windows) {
 bool Browser::ContinueUserActivity(const std::string& type,
                                    const std::map<std::string,
                                    std::string>& user_info) {
-  bool handled = false;
+  bool prevent_default = false;
   FOR_EACH_OBSERVER(BrowserObserver,
                     observers_,
-                    OnContinueUserActivity(&handled, type, user_info));
+                    OnContinueUserActivity(&prevent_default, type, user_info));
 
-  return handled;
+  return prevent_default;
 }
 #endif
 
diff --git a/atom/browser/browser_observer.h b/atom/browser/browser_observer.h
index 977f1a8..4ad0013 100644
--- a/atom/browser/browser_observer.h
+++ b/atom/browser/browser_observer.h
@@ -47,7 +47,7 @@ class BrowserObserver {
   virtual void OnLogin(LoginHandler* login_handler) {}
 
   // 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::map<std::string, std::string>& user_info) {}
 
-- 
2.7.4