mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

move atom_menu_controller_mac to browser/ui/cocoa.

Browse source
This commit is contained in:
Cheng Zhao 2014-01-16 10:15:35 +08:00
parent 43711083f7
commit 9ac555c302
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom.gyp
View file

@ -106,8 +106,8 @@
'browser/ui/accelerator_util.h', 'browser/ui/accelerator_util.h',
'browser/ui/accelerator_util_mac.mm', 'browser/ui/accelerator_util_mac.mm',
'browser/ui/accelerator_util_win.cc', 'browser/ui/accelerator_util_win.cc',
'browser/ui/atom_menu_controller_mac.h', 'browser/ui/cocoa/atom_menu_controller.h',
'browser/ui/atom_menu_controller_mac.mm', 'browser/ui/cocoa/atom_menu_controller.mm',
'browser/ui/cocoa/event_processing_window.h', 'browser/ui/cocoa/event_processing_window.h',
'browser/ui/cocoa/event_processing_window.mm', 'browser/ui/cocoa/event_processing_window.mm',
'browser/ui/cocoa/nsalert_synchronous_sheet.h', 'browser/ui/cocoa/nsalert_synchronous_sheet.h',

2
browser/api/atom_api_menu_mac.h
View file

@ -7,7 +7,7 @@
#include "browser/api/atom_api_menu.h" #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 { namespace atom {

6
browser/ui/atom_menu_controller_mac.h → browser/ui/cocoa/atom_menu_controller.h
View file

@ -3,8 +3,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_ #ifndef ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
#define ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_ #define ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@ -69,4 +69,4 @@ class MenuModel;
- (NSMenu*)menuFromModel:(ui::MenuModel*)model; - (NSMenu*)menuFromModel:(ui::MenuModel*)model;
@end @end
#endif // ATOM_BROWSER_UI_ATOM_MENU_CONTROLLER_MAC_H_ #endif // ATOM_BROWSER_UI_COCOA_ATOM_MENU_CONTROLLER_H_

2
browser/ui/atom_menu_controller_mac.mm → browser/ui/cocoa/atom_menu_controller.mm
View file

@ -3,7 +3,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/logging.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"