Make the Linter happy.
authorCharlie Hess <charlie@slack-corp.com>
Sat, 30 Apr 2016 05:05:36 +0000 (22:05 -0700)
committerCharlie Hess <charlie@slack-corp.com>
Sat, 30 Apr 2016 05:05:36 +0000 (22:05 -0700)
atom/browser/api/atom_api_app.cc
atom/browser/api/atom_api_app.h
atom/browser/browser.cc
atom/browser/browser.h
atom/browser/browser_observer.h
atom/common/native_mate_converters/string_map_converter.cc
atom/common/native_mate_converters/string_map_converter.h

index fb258e2..0e2a6e5 100644 (file)
@@ -250,7 +250,9 @@ void App::OnFinishLaunching() {
   Emit("ready");
 }
 
-void App::OnContinueUserActivity(bool* handled, const std::string& type, const std::map<std::string, std::string>& user_info) {
+void App::OnContinueUserActivity(bool* handled,
+  const std::string& type,
+  const std::map<std::string, std::string>& user_info) {
   *handled = Emit("continue-activity", type, user_info);
 }
 
@@ -465,7 +467,8 @@ void App::BuildPrototype(
 #if defined(OS_MACOSX)
       .SetMethod("hide", base::Bind(&Browser::Hide, browser))
       .SetMethod("show", base::Bind(&Browser::Show, browser))
-      .SetMethod("setUserActivity", base::Bind(&Browser::SetUserActivity, browser))
+      .SetMethod("setUserActivity",
+                 base::Bind(&Browser::SetUserActivity, browser))
 #endif
 #if defined(OS_WIN)
       .SetMethod("setUserTasks",
index 882f053..3a13322 100644 (file)
@@ -72,7 +72,9 @@ class App : public AtomBrowserClient::Delegate,
   void OnWillFinishLaunching() override;
   void OnFinishLaunching() override;
   void OnLogin(LoginHandler* login_handler) override;
-  void OnContinueUserActivity(bool* handled, const std::string& type, const std::map<std::string, std::string>& user_info) override;
+  void OnContinueUserActivity(bool* handled,
+    const std::string& type,
+    const std::map<std::string, std::string>& user_info) override;
 
   // content::ContentBrowserClient:
   void AllowCertificateError(
index 94f3948..1598019 100644 (file)
@@ -138,12 +138,14 @@ void Browser::Activate(bool has_visible_windows) {
 }
 
 #if defined(OS_MACOSX)
-bool Browser::ContinueUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info) {
+bool Browser::ContinueUserActivity(const std::string& type,
+                                   const std::map<std::string,
+                                   std::string>& user_info) {
   bool handled = false;
-  FOR_EACH_OBSERVER(BrowserObserver, 
-                    observers_, 
+  FOR_EACH_OBSERVER(BrowserObserver,
+                    observers_,
                     OnContinueUserActivity(&handled, type, user_info));
-                    
+
   return handled;
 }
 #endif
index 4fb140e..14f94a0 100644 (file)
@@ -94,10 +94,12 @@ class Browser : public WindowListObserver {
   void Show();
 
   // Creates an activity and sets it as the one currently in use.
-  void SetUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info);
-  
+  void SetUserActivity(const std::string& type,
+                       const std::map<std::string, std::string>& user_info);
+
   // Resumes an activity via hand-off.
-  bool ContinueUserActivity(const std::string& type, const std::map<std::string, std::string>& user_info);
+  bool ContinueUserActivity(const std::string& type,
+    const std::map<std::string, std::string>& user_info);
 
   // Bounce the dock icon.
   enum BounceType {
index 11346f3..977f1a8 100644 (file)
@@ -48,8 +48,8 @@ class BrowserObserver {
 
   // The browser wants to resume a user activity via handoff. (OS X only)
   virtual void OnContinueUserActivity(bool* handled,
-                                      const std::string& type,
-                                      const std::map<std::string, std::string>& user_info) {}
+    const std::string& type,
+    const std::map<std::string, std::string>& user_info) {}
 
  protected:
   virtual ~BrowserObserver() {}
index dce3c38..475b052 100644 (file)
@@ -6,10 +6,9 @@
 
 namespace mate {
 
-bool Converter<std::map<std::string, std::string>>::FromV8(v8::Isolate* isolate, 
+bool Converter<std::map<std::string, std::string>>::FromV8(v8::Isolate* isolate,
   v8::Local<v8::Value> val,
   std::map<std::string, std::string>* out) {
-
   if (!val->IsObject())
     return false;
 
@@ -22,9 +21,9 @@ bool Converter<std::map<std::string, std::string>>::FromV8(v8::Isolate* isolate,
   return true;
 }
 
-v8::Local<v8::Value> Converter<std::map<std::string, std::string>>::ToV8(v8::Isolate* isolate,
+v8::Local<v8::Value> Converter<std::map<std::string, std::string>>::ToV8(
+  v8::Isolate* isolate,
   const std::map<std::string, std::string>& in) {
-
   mate::Dictionary dict(isolate, v8::Object::New(isolate));
 
   for (auto const &pair : in) {
@@ -34,4 +33,4 @@ v8::Local<v8::Value> Converter<std::map<std::string, std::string>>::ToV8(v8::Iso
   return dict.GetHandle();
 }
 
-} // namespace mate
\ No newline at end of file
+}  // namespace mate
index bdab0be..54e4297 100644 (file)
@@ -20,9 +20,9 @@ struct Converter<std::map<std::string, std::string>> {
                      std::map<std::string, std::string>* out);
 
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   const std::map<std::string, std::string>& in);
+    const std::map<std::string, std::string>& in);
 };
 
 }  // namespace mate
 
-#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING_MAP_CONVERTER_H_
\ No newline at end of file
+#endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_STRING_MAP_CONVERTER_H_