From 9ac555c302c2c21069b17547f02319a27c5c394d Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 16 Jan 2014 10:15:35 +0800
Subject: [PATCH] move atom_menu_controller_mac to browser/ui/cocoa.

---
 atom.gyp                                                    | 4 ++--
 browser/api/atom_api_menu_mac.h                             | 2 +-
 .../atom_menu_controller.h}                                 | 6 +++---
 .../atom_menu_controller.mm}                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename browser/ui/{atom_menu_controller_mac.h => cocoa/atom_menu_controller.h} (93%)
 rename browser/ui/{atom_menu_controller_mac.mm => cocoa/atom_menu_controller.mm} (99%)

diff --git a/atom.gyp b/atom.gyp
index f4d52a4b668..88d9755d382 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -106,8 +106,8 @@
       'browser/ui/accelerator_util.h',
       'browser/ui/accelerator_util_mac.mm',
       'browser/ui/accelerator_util_win.cc',
-      'browser/ui/atom_menu_controller_mac.h',
-      'browser/ui/atom_menu_controller_mac.mm',
+      'browser/ui/cocoa/atom_menu_controller.h',
+      'browser/ui/cocoa/atom_menu_controller.mm',
       'browser/ui/cocoa/event_processing_window.h',
       'browser/ui/cocoa/event_processing_window.mm',
       'browser/ui/cocoa/nsalert_synchronous_sheet.h',
diff --git a/browser/api/atom_api_menu_mac.h b/browser/api/atom_api_menu_mac.h
index 46c133e66f2..62da458aeb5 100644
--- a/browser/api/atom_api_menu_mac.h
+++ b/browser/api/atom_api_menu_mac.h
@@ -7,7 +7,7 @@
 
 #include "browser/api/atom_api_menu.h"
 
-#import "browser/ui/atom_menu_controller_mac.h"
+#import "browser/ui/cocoa/atom_menu_controller.h"
 
 namespace atom {
 
diff --git a/browser/ui/atom_menu_controller_mac.h b/browser/ui/cocoa/atom_menu_controller.h
similarity index 93%
rename from browser/ui/atom_menu_controller_mac.h
rename to browser/ui/cocoa/atom_menu_controller.h
index 834ea9a98ef..afd60931f5b 100644
--- a/browser/ui/atom_menu_controller_mac.h
+++ b/browser/ui/cocoa/atom_menu_controller.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
-#define ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
+#ifndef ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
+#define ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -69,4 +69,4 @@ class MenuModel;
 - (NSMenu*)menuFromModel:(ui::MenuModel*)model;
 @end
 
-#endif  // ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_
+#endif  // ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
diff --git a/browser/ui/atom_menu_controller_mac.mm b/browser/ui/cocoa/atom_menu_controller.mm
similarity index 99%
rename from browser/ui/atom_menu_controller_mac.mm
rename to browser/ui/cocoa/atom_menu_controller.mm
index 13fd73bc175..0a23ab2921e 100644
--- a/browser/ui/atom_menu_controller_mac.mm
+++ b/browser/ui/cocoa/atom_menu_controller.mm
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/ui/atom_menu_controller_mac.h"
+#import "browser/ui/cocoa/atom_menu_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"