Make everything pointer like

MarshallOfSound · kevinsawicki · commit 60cc8620317e · 2017-04-04T12:50:41.000-07:00
diff --git a/atom/browser/api/atom_api_window.cc b/atom/browser/api/atom_api_window.cc
@@ -853,7 +853,7 @@ void Window::RefreshTouchBarItem(const std::string& item_id) {
   window_->RefreshTouchBarItem(item_id);
 }
 
-void Window::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {
+void Window::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {
   window_->SetEscapeTouchBarItem(item);
 }
 
diff --git a/atom/browser/api/atom_api_window.h b/atom/browser/api/atom_api_window.h
@@ -208,7 +208,7 @@ class Window : public mate::TrackableObject<Window>,
   void SetVibrancy(mate::Arguments* args);
   void SetTouchBar(const std::vector<mate::PersistentDictionary>& items);
   void RefreshTouchBarItem(const std::string& item_id);
-  void SetEscapeTouchBarItem(const mate::PersistentDictionary item);
+  void SetEscapeTouchBarItem(const mate::PersistentDictionary& item);
 
   v8::Local<v8::Value> WebContents(v8::Isolate* isolate);
 
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
@@ -347,7 +347,7 @@ void NativeWindow::SetTouchBar(
 void NativeWindow::RefreshTouchBarItem(const std::string& item_id) {
 }
 
-void NativeWindow::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {
+void NativeWindow::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {
 }
 
 void NativeWindow::FocusOnWebView() {
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
@@ -174,7 +174,7 @@ class NativeWindow : public base::SupportsUserData,
   virtual void SetTouchBar(
       const std::vector<mate::PersistentDictionary>& items);
   virtual void RefreshTouchBarItem(const std::string& item_id);
-  virtual void SetEscapeTouchBarItem(const mate::PersistentDictionary item);
+  virtual void SetEscapeTouchBarItem(const mate::PersistentDictionary& item);
 
   // Webview APIs.
   virtual void FocusOnWebView();
diff --git a/atom/browser/native_window_mac.h b/atom/browser/native_window_mac.h
@@ -103,7 +103,7 @@ class NativeWindowMac : public NativeWindow,
   void SetTouchBar(
       const std::vector<mate::PersistentDictionary>& items) override;
   void RefreshTouchBarItem(const std::string& item_id) override;
-  void SetEscapeTouchBarItem(const mate::PersistentDictionary item) override;
+  void SetEscapeTouchBarItem(const mate::PersistentDictionary& item) override;
 
   // content::RenderWidgetHost::InputEventObserver:
   void OnInputEvent(const blink::WebInputEvent& event) override;
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
@@ -411,7 +411,7 @@ - (NSTouchBarItem*)touchBar:(NSTouchBar*)touchBar
 }
 
 -(void)setEscapeTouchBarItem:(mate::PersistentDictionary)item {
-  if (self.touchBar && atom_touch_bar_)
+  if (atom_touch_bar_ && self.touchBar)
     [atom_touch_bar_ setEscapeTouchBarItem:item forTouchBar:self.touchBar];
 }
 
@@ -1422,7 +1422,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,
   [window_ refreshTouchBarItem:item_id];
 }
 
-void NativeWindowMac::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {
+void NativeWindowMac::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {
   [window_ setEscapeTouchBarItem:item];
 }
 
diff --git a/atom/browser/ui/cocoa/atom_touch_bar.h b/atom/browser/ui/cocoa/atom_touch_bar.h
@@ -31,8 +31,8 @@
 - (NSTouchBar*)touchBarFromItemIdentifiers:(NSMutableArray*)items;
 - (NSMutableArray*)identifiersFromSettings:(const std::vector<mate::PersistentDictionary>&)settings;
 - (void)refreshTouchBarItem:(NSTouchBar*)touchBar id:(const std::string&)item_id;
-- (void)addNonDefaultTouchBarItems:(std::vector<mate::PersistentDictionary>)items;
-- (void)setEscapeTouchBarItem:(mate::PersistentDictionary)item forTouchBar:(NSTouchBar*)touchBar;
+- (void)addNonDefaultTouchBarItems:(const std::vector<mate::PersistentDictionary>&)items;
+- (void)setEscapeTouchBarItem:(const mate::PersistentDictionary&)item forTouchBar:(NSTouchBar*)touchBar;
 
 
 - (NSString*)idFromIdentifier:(NSString*)identifier withPrefix:(NSString*)prefix;
diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm
@@ -147,11 +147,11 @@ - (void)refreshTouchBarItem:(NSTouchBar*)touchBar
   }
 }
 
-- (void)addNonDefaultTouchBarItems:(std::vector<mate::PersistentDictionary>)items {
+- (void)addNonDefaultTouchBarItems:(const std::vector<mate::PersistentDictionary>&)items {
   [self identifiersFromSettings:items];
 }
 
-- (void)setEscapeTouchBarItem:(mate::PersistentDictionary)item forTouchBar:(NSTouchBar*)touchBar {
+- (void)setEscapeTouchBarItem:(const mate::PersistentDictionary&)item forTouchBar:(NSTouchBar*)touchBar {
   std::string type;
   std::string item_id;
   NSTouchBarItemIdentifier identifier = nil;
diff --git a/docs/api/touch-bar.md b/docs/api/touch-bar.md
@@ -18,7 +18,7 @@ removed in future Electron releases.
 
 The following methods are available on instances of `TouchBar`:
 
-#### `touchBar.replaceEscapeItem([touchBarItem])`
+#### `touchBar.setEscapeItem([touchBarItem])`
 
 * `touchBarItem` (TouchBarButton | TouchBarColorPicker | TouchBarGroup | TouchBarLabel | TouchBarPopover | TouchBarScrubber | TouchBarSegmentedControl | TouchBarSlider | TouchBarSpacer) - (Optional) The touch bar item to replace the escape button with
 
diff --git a/lib/browser/api/touch-bar.js b/lib/browser/api/touch-bar.js
@@ -50,13 +50,13 @@ class TouchBar extends EventEmitter {
     })
   }
 
-  replaceEscapeItem(item) {
+  setEscapeItem(item) {
     if (!item) item = {}
     Object.keys(this.windows).forEach((windowID) => {
       const window = this.windows[windowID]
       window._setEscapeTouchBarItem(item)
     })
-    this._escape = item;
+    this._escape = item
   }
 
   _addToWindow (window) {
@@ -90,7 +90,7 @@ class TouchBar extends EventEmitter {
     }
     window.once('closed', removeListeners)
     this.windowListeners[id] = removeListeners
-    this.windows[id] = window;
+    this.windows[id] = window
 
     window._setTouchBarItems(this.ordereredItems)
 

Original file line number	Diff line number	Diff line change
`@@ -853,7 +853,7 @@ void Window::RefreshTouchBarItem(const std::string& item_id) {`
`853`	`853`	`window_->RefreshTouchBarItem(item_id);`
`854`	`854`	`}`
`855`	`855`
`856`		`-void Window::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {`
	`856`	`+void Window::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {`
`857`	`857`	`window_->SetEscapeTouchBarItem(item);`
`858`	`858`	`}`
`859`	`859`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ void NativeWindow::SetTouchBar(`
`347`	`347`	`void NativeWindow::RefreshTouchBarItem(const std::string& item_id) {`
`348`	`348`	`}`
`349`	`349`
`350`		`-void NativeWindow::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {`
	`350`	`+void NativeWindow::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`void NativeWindow::FocusOnWebView() {`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ - (NSTouchBarItem)touchBar:(NSTouchBar)touchBar`
`411`	`411`	`}`
`412`	`412`
`413`	`413`	`-(void)setEscapeTouchBarItem:(mate::PersistentDictionary)item {`
`414`		`- if (self.touchBar && atom_touch_bar_)`
	`414`	`+ if (atom_touch_bar_ && self.touchBar)`
`415`	`415`	`[atom_touch_bar_ setEscapeTouchBarItem:item forTouchBar:self.touchBar];`
`416`	`416`	`}`
`417`	`417`
`@@ -1422,7 +1422,7 @@ static bool FromV8(v8::Isolate* isolate, v8::Handle<v8::Value> val,`
`1422`	`1422`	`[window_ refreshTouchBarItem:item_id];`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`-void NativeWindowMac::SetEscapeTouchBarItem(const mate::PersistentDictionary item) {`
	`1425`	`+void NativeWindowMac::SetEscapeTouchBarItem(const mate::PersistentDictionary& item) {`
`1426`	`1426`	`[window_ setEscapeTouchBarItem:item];`
`1427`	`1427`	`}`
`1428`	`1428`
Original file line number	Diff line number	Diff line change
`@@ -147,11 +147,11 @@ - (void)refreshTouchBarItem:(NSTouchBar*)touchBar`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`		`-- (void)addNonDefaultTouchBarItems:(std::vector<mate::PersistentDictionary>)items {`
	`150`	`+- (void)addNonDefaultTouchBarItems:(const std::vector<mate::PersistentDictionary>&)items {`
`151`	`151`	`[self identifiersFromSettings:items];`
`152`	`152`	`}`
`153`	`153`
`154`		`-- (void)setEscapeTouchBarItem:(mate::PersistentDictionary)item forTouchBar:(NSTouchBar*)touchBar {`
	`154`	`+- (void)setEscapeTouchBarItem:(const mate::PersistentDictionary&)item forTouchBar:(NSTouchBar*)touchBar {`
`155`	`155`	`std::string type;`
`156`	`156`	`std::string item_id;`
`157`	`157`	`NSTouchBarItemIdentifier identifier = nil;`