summaryrefslogtreecommitdiffstats
path: root/remoting/host
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 01:18:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 01:18:20 +0000
commite19c2fc0de147c55adc24bea05f0c8254cf0a024 (patch)
treeb1627d34e9d5ee1404e48e4ffdd3de0ac90f04a5 /remoting/host
parent82591dd2cbaa2ace67300c037e77549e3900be1c (diff)
downloadchromium_src-e19c2fc0de147c55adc24bea05f0c8254cf0a024.zip
chromium_src-e19c2fc0de147c55adc24bea05f0c8254cf0a024.tar.gz
chromium_src-e19c2fc0de147c55adc24bea05f0c8254cf0a024.tar.bz2
remoting/host: Fix cpplint warning of header guards.
Found by: $ cpplint.py remoting/host/* 2>&1 | grep "guard has wrong" R=jamiewalch@chromium.org,alexeypa@chromium.org Review URL: https://chromiumcodereview.appspot.com/10700129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
-rw-r--r--remoting/host/capturer.h2
-rw-r--r--remoting/host/clipboard.h2
-rw-r--r--remoting/host/continue_window.h8
-rw-r--r--remoting/host/disconnect_window.h9
-rw-r--r--remoting/host/local_input_monitor.h6
-rw-r--r--remoting/host/local_input_monitor_thread_linux.h11
-rw-r--r--remoting/host/local_input_monitor_thread_win.h10
-rw-r--r--remoting/host/sighup_listener_mac.h6
-rw-r--r--remoting/host/signaling_connector.h6
-rw-r--r--remoting/host/verify_config_window_win.h8
-rw-r--r--remoting/host/wts_console_observer_win.h6
11 files changed, 37 insertions, 37 deletions
diff --git a/remoting/host/capturer.h b/remoting/host/capturer.h
index 0eaf1b4..311aee1 100644
--- a/remoting/host/capturer.h
+++ b/remoting/host/capturer.h
@@ -59,7 +59,7 @@ class Capturer {
typedef base::Callback<void(scoped_ptr<protocol::CursorShapeInfo>)>
CursorShapeChangedCallback;
- virtual ~Capturer() {};
+ virtual ~Capturer() {}
// Create platform-specific capturer.
static Capturer* Create();
diff --git a/remoting/host/clipboard.h b/remoting/host/clipboard.h
index 8ebe2d8..534bc4b 100644
--- a/remoting/host/clipboard.h
+++ b/remoting/host/clipboard.h
@@ -20,7 +20,7 @@ class ClipboardStub;
// can get change notifications.
class Clipboard {
public:
- virtual ~Clipboard() {};
+ virtual ~Clipboard() {}
// Initialises any objects needed to read from or write to the clipboard.
virtual void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) = 0;
diff --git a/remoting/host/continue_window.h b/remoting/host/continue_window.h
index 384c76d..98e5347 100644
--- a/remoting/host/continue_window.h
+++ b/remoting/host/continue_window.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_HOST_CONTINUE_WINDOW_H
-#define REMOTING_HOST_CONTINUE_WINDOW_H
+#ifndef REMOTING_HOST_CONTINUE_WINDOW_H_
+#define REMOTING_HOST_CONTINUE_WINDOW_H_
#include "base/callback.h"
@@ -32,6 +32,6 @@ class ContinueWindow {
static scoped_ptr<ContinueWindow> Create();
};
-}
+} // namespace remoting
-#endif // REMOTING_HOST_CONTINUE_WINDOW_H
+#endif // REMOTING_HOST_CONTINUE_WINDOW_H_
diff --git a/remoting/host/disconnect_window.h b/remoting/host/disconnect_window.h
index f55a90b..c111ab8 100644
--- a/remoting/host/disconnect_window.h
+++ b/remoting/host/disconnect_window.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_HOST_DISCONNECT_WINDOW_H
-#define REMOTING_HOST_DISCONNECT_WINDOW_H
+#ifndef REMOTING_HOST_DISCONNECT_WINDOW_H_
+#define REMOTING_HOST_DISCONNECT_WINDOW_H_
#include <string>
@@ -16,7 +16,6 @@ class ChromotingHost;
class DisconnectWindow {
public:
-
enum {
kMaximumConnectedNameWidthInPixels = 400
};
@@ -39,6 +38,6 @@ class DisconnectWindow {
static scoped_ptr<DisconnectWindow> Create();
};
-}
+} // namespace remoting
-#endif // REMOTING_HOST_DISCONNECT_WINDOW_H
+#endif // REMOTING_HOST_DISCONNECT_WINDOW_H_
diff --git a/remoting/host/local_input_monitor.h b/remoting/host/local_input_monitor.h
index 0c36da7..43513ef 100644
--- a/remoting/host/local_input_monitor.h
+++ b/remoting/host/local_input_monitor.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_LOCAL_INPUT_MONITOR_H_
-#define REMOTING_LOCAL_INPUT_MONITOR_H_
+#ifndef REMOTING_HOST_LOCAL_INPUT_MONITOR_H_
+#define REMOTING_HOST_LOCAL_INPUT_MONITOR_H_
#include "base/callback_forward.h"
#include "base/memory/scoped_ptr.h"
@@ -31,4 +31,4 @@ class LocalInputMonitor {
} // namespace remoting
-#endif
+#endif // REMOTING_HOST_LOCAL_INPUT_MONITOR_H_
diff --git a/remoting/host/local_input_monitor_thread_linux.h b/remoting/host/local_input_monitor_thread_linux.h
index 5b5dd59..83d97fc 100644
--- a/remoting/host/local_input_monitor_thread_linux.h
+++ b/remoting/host/local_input_monitor_thread_linux.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef LOCAL_INPUT_MONITOR_THREAD_LINUX_H_
-#define LOCAL_INPUT_MONITOR_THREAD_LINUX_H_
+#ifndef REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_LINUX_H_
+#define REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_LINUX_H_
#include "base/callback.h"
#include "base/compiler_specific.h"
@@ -21,9 +21,8 @@ class MouseMoveObserver;
class LocalInputMonitorThread : public base::SimpleThread {
public:
- LocalInputMonitorThread(
- MouseMoveObserver* mouse_move_observer,
- const base::Closure& disconnect_callback);
+ LocalInputMonitorThread(MouseMoveObserver* mouse_move_observer,
+ const base::Closure& disconnect_callback);
virtual ~LocalInputMonitorThread();
void Stop();
@@ -45,4 +44,4 @@ class LocalInputMonitorThread : public base::SimpleThread {
} // namespace remoting
-#endif
+#endif // REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_LINUX_H_
diff --git a/remoting/host/local_input_monitor_thread_win.h b/remoting/host/local_input_monitor_thread_win.h
index 44fda24..92687b2 100644
--- a/remoting/host/local_input_monitor_thread_win.h
+++ b/remoting/host/local_input_monitor_thread_win.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef LOCAL_INPUT_MONITOR_THREAD_WIN_H_
-#define LOCAL_INPUT_MONITOR_THREAD_WIN_H_
+#ifndef REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_WIN_H_
+#define REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_WIN_H_
#include <set>
@@ -31,7 +31,9 @@ class LocalInputMonitorThread : public base::SimpleThread {
bool RemoveObserver(MouseMoveObserver* mouse_move_observer);
void Stop();
- virtual void Run() OVERRIDE; // Overridden from SimpleThread.
+
+ // Overridden from base::SimpleThread:
+ virtual void Run() OVERRIDE;
void LocalMouseMoved(const SkIPoint& mouse_position);
static LRESULT WINAPI HandleLowLevelMouseEvent(int code,
@@ -47,4 +49,4 @@ class LocalInputMonitorThread : public base::SimpleThread {
} // namespace remoting
-#endif
+#endif // REMOTING_HOST_LOCAL_INPUT_MONITOR_THREAD_WIN_H_
diff --git a/remoting/host/sighup_listener_mac.h b/remoting/host/sighup_listener_mac.h
index d9b87e9..a068759 100644
--- a/remoting/host/sighup_listener_mac.h
+++ b/remoting/host/sighup_listener_mac.h
@@ -6,8 +6,8 @@
// and trigger the specified callback. It is currently used on Mac in order to
// reload the me2me host configuration, but would need minimal changes on Linux.
-#ifndef REMOTING_SIGHUP_LISTENER_MAC_H_
-#define REMOTING_SIGHUP_LISTENER_MAC_H_
+#ifndef REMOTING_HOST_SIGHUP_LISTENER_MAC_H_
+#define REMOTING_HOST_SIGHUP_LISTENER_MAC_H_
#include "base/callback_forward.h"
@@ -19,4 +19,4 @@ bool RegisterHupSignalHandler(const base::Closure& callback);
} // namespace remoting
-#endif // REMOTING_SIGHUP_LISTENER_MAC_H_
+#endif // REMOTING_HOST_SIGHUP_LISTENER_MAC_H_
diff --git a/remoting/host/signaling_connector.h b/remoting/host/signaling_connector.h
index 582b4ae..6cad617 100644
--- a/remoting/host/signaling_connector.h
+++ b/remoting/host/signaling_connector.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_HOST_SIGNALING_CONNECTOR_H
-#define REMOTING_HOST_SIGNALING_CONNECTOR_H
+#ifndef REMOTING_HOST_SIGNALING_CONNECTOR_H_
+#define REMOTING_HOST_SIGNALING_CONNECTOR_H_
#include "base/basictypes.h"
#include "base/memory/weak_ptr.h"
@@ -104,4 +104,4 @@ class SignalingConnector
} // namespace remoting
-#endif // REMOTING_HOST_SIGNALING_CONNECTOR_H
+#endif // REMOTING_HOST_SIGNALING_CONNECTOR_H_
diff --git a/remoting/host/verify_config_window_win.h b/remoting/host/verify_config_window_win.h
index 128b6ec..b5415dd 100644
--- a/remoting/host/verify_config_window_win.h
+++ b/remoting/host/verify_config_window_win.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H
-#define REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H
+#ifndef REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H_
+#define REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H_
// altbase.h must be included before atlapp.h
#include <atlbase.h>
@@ -52,6 +52,6 @@ class VerifyConfigWindowWin : public ATL::CDialogImpl<VerifyConfigWindowWin> {
DISALLOW_COPY_AND_ASSIGN(VerifyConfigWindowWin);
};
-}
+} // namespace remoting
-#endif // REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H
+#endif // REMOTING_HOST_VERIFY_CONFIG_WINDOW_WIN_H_
diff --git a/remoting/host/wts_console_observer_win.h b/remoting/host/wts_console_observer_win.h
index 7f4d8475..212ccd6 100644
--- a/remoting/host/wts_console_observer_win.h
+++ b/remoting/host/wts_console_observer_win.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_HOST_wts_console_observer_win_H_
-#define REMOTING_HOST_wts_console_observer_win_H_
+#ifndef REMOTING_HOST_WTS_CONSOLE_OBSERVER_WIN_H_
+#define REMOTING_HOST_WTS_CONSOLE_OBSERVER_WIN_H_
#include <windows.h>
@@ -31,4 +31,4 @@ class WtsConsoleObserver {
} // namespace remoting
-#endif // REMOTING_HOST_wts_console_observer_win_H_
+#endif // REMOTING_HOST_WTS_CONSOLE_OBSERVER_WIN_H_
generated by cgit v1.1 at 2025-03-09 19:35:19 +0000