Format code

electron · Dec 5, 2018 · 402d2f6 · 402d2f6
1 parent b9e3bf8
commit 402d2f6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/atom/browser/native_window.h b/atom/browser/native_window.h
@@ -38,18 +38,17 @@ class Dictionary;
 class PersistentDictionary;
 }  // namespace mate
 
-namespace appCommand {
-const char kBrowserForward[] = "browser-forward";
-const char kBrowserBackward[] = "browser-backward";
-}  // namespace appCommand
-
 namespace atom {
 
 class AtomMenuModel;
 class NativeBrowserView;
 
 struct DraggableRegion;
 
+// Constants for app commands.
+const char kBrowserForward[] = "browser-forward";
+const char kBrowserBackward[] = "browser-backward";
+
 class NativeWindow : public base::SupportsUserData,
                      public views::WidgetDelegate {
  public:

diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
@@ -289,6 +289,7 @@ NativeWindowViews::NativeWindowViews(const mate::Dictionary& options,
 #endif
 
 #if defined(OS_LINUX)
+  // Listen to move events.
   aura::Window* window = GetNativeWindow();
   if (window)
     window->AddPreTargetHandler(this);
@@ -1288,9 +1289,9 @@ void NativeWindowViews::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
 #if defined(OS_LINUX)
   if (event.windows_key_code == ui::VKEY_BROWSER_BACK)
-    NotifyWindowExecuteAppCommand(appCommand::kBrowserBackward);
-  if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
-    NotifyWindowExecuteAppCommand(appCommand::kBrowserForward);
+    NotifyWindowExecuteAppCommand(kBrowserBackward);
+  else if (event.windows_key_code == ui::VKEY_BROWSER_FORWARD)
+    NotifyWindowExecuteAppCommand(kBrowserForward);
 #endif
 
   keyboard_event_handler_->HandleKeyboardEvent(event,
@@ -1304,9 +1305,9 @@ void NativeWindowViews::OnMouseEvent(ui::MouseEvent* event) {
     return;
 
   if (event->changed_button_flags() == ui::EF_BACK_MOUSE_BUTTON)
-    NotifyWindowExecuteAppCommand(appCommand::kBrowserBackward);
-  if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON)
-    NotifyWindowExecuteAppCommand(appCommand::kBrowserForward);
+    NotifyWindowExecuteAppCommand(kBrowserBackward);
+  else if (event->changed_button_flags() == ui::EF_FORWARD_MOUSE_BUTTON)
+    NotifyWindowExecuteAppCommand(kBrowserForward);
 }
 #endif
 

diff --git a/atom/browser/native_window_views.h b/atom/browser/native_window_views.h
@@ -206,7 +206,7 @@ class NativeWindowViews : public NativeWindow,
       const content::NativeWebKeyboardEvent& event) override;
 
 #if defined(OS_LINUX)
-  // EventHandler:
+  // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override;
 #endif
 

diff --git a/atom/browser/native_window_views_win.cc b/atom/browser/native_window_views_win.cc
@@ -18,9 +18,9 @@ namespace {
 const char* AppCommandToString(int command_id) {
   switch (command_id) {
     case APPCOMMAND_BROWSER_BACKWARD:
-      return appCommand::kBrowserBackward;
+      return kBrowserBackward;
     case APPCOMMAND_BROWSER_FORWARD:
-      return appCommand::kBrowserForward;
+      return kBrowserForward;
     case APPCOMMAND_BROWSER_REFRESH:
       return "browser-refresh";
     case APPCOMMAND_BROWSER_STOP:

diff --git a/atom/common/atom_constants.cc b/atom/common/atom_constants.cc
@@ -6,6 +6,9 @@
 
 namespace atom {
 
+const char kBrowserForward[] = "browser-forward";
+const char kBrowserBackward[] = "browser-backward";
+
 const char kCORSHeader[] = "Access-Control-Allow-Origin: *";
 
 const char kSHA1Certificate[] = "SHA-1 Certificate";

diff --git a/atom/common/atom_constants.h b/atom/common/atom_constants.h
@@ -9,6 +9,10 @@
 
 namespace atom {
 
+// The app-command in NativeWindow.
+extern const char kBrowserForward[];
+extern const char kBrowserBackward[];
+
 // Header to ignore CORS.
 extern const char kCORSHeader[];
 

diff --git a/docs/api/browser-window.md b/docs/api/browser-window.md
@@ -580,7 +580,7 @@ win.on('app-command', (e, cmd) => {
 })
 ```
 
-The following app commands are explictly supported on Linux
+The following app commands are explictly supported on Linux:
 
 * `browser-backward`
 * `browser-forward`