Commit f4121a01 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Rename one of the two NOTIFY_OBSERVERS macros

There was still two NOTIFY_OBSERVERS macros and in jumbo builds
they triggered an error about macros being redeclared. This
patch renames the macro that implements observer handling
methods for Windows from NOTIFY_OBSERVERS to NOTIFY_OBSERVERS_METHOD.

Bug: 773275
Change-Id: Ie58fd1793b144b694a0a34bfa552569db3f8a200
Reviewed-on: https://chromium-review.googlesource.com/836611Reviewed-by: default avatarSadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Daniel Bratell <bratell@opera.com>
Cr-Commit-Position: refs/heads/master@{#525333}
parent 3d31864d
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "base/strings/string16.h" #include "base/strings/string16.h"
// This macro provides the implementation for the observer notification methods. // This macro provides the implementation for the observer notification methods.
#define NOTIFY_OBSERVERS(method_decl, observer_call) \ #define NOTIFY_OBSERVERS_METHOD(method_decl, observer_call) \
void InputDeviceObserverWin::method_decl { \ void InputDeviceObserverWin::method_decl { \
for (InputDeviceEventObserver & observer : observers_) \ for (InputDeviceEventObserver & observer : observers_) \
observer.observer_call; \ observer.observer_call; \
} }
namespace ui { namespace ui {
...@@ -90,10 +90,10 @@ void InputDeviceObserverWin::RemoveObserver( ...@@ -90,10 +90,10 @@ void InputDeviceObserverWin::RemoveObserver(
observers_.RemoveObserver(observer); observers_.RemoveObserver(observer);
} }
NOTIFY_OBSERVERS(NotifyObserversKeyboardDeviceConfigurationChanged(), NOTIFY_OBSERVERS_METHOD(NotifyObserversKeyboardDeviceConfigurationChanged(),
OnKeyboardDeviceConfigurationChanged()); OnKeyboardDeviceConfigurationChanged());
NOTIFY_OBSERVERS(NotifyObserversTouchpadDeviceConfigurationChanged(), NOTIFY_OBSERVERS_METHOD(NotifyObserversTouchpadDeviceConfigurationChanged(),
OnTouchpadDeviceConfigurationChanged()); OnTouchpadDeviceConfigurationChanged());
} // namespace ui } // namespace ui
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment