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

Move accelerator_util to browser/ui.

Browse source
This commit is contained in:
Cheng Zhao 2013-08-13 17:07:25 +08:00
parent d2f1a03b51
commit f4425afb39
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom.gyp
View file

@ -32,10 +32,6 @@
'lib_sources': [ 'lib_sources': [
'app/atom_main_delegate.cc', 'app/atom_main_delegate.cc',
'app/atom_main_delegate.h', 'app/atom_main_delegate.h',
'browser/accelerator_util.cc',
'browser/accelerator_util.h',
'browser/accelerator_util_mac.mm',
'browser/accelerator_util_win.cc',
'browser/api/atom_api_app.cc', 'browser/api/atom_api_app.cc',
'browser/api/atom_api_app.h', 'browser/api/atom_api_app.h',
'browser/api/atom_api_auto_updater.cc', 'browser/api/atom_api_auto_updater.cc',
@ -98,6 +94,10 @@
'browser/native_window_win.cc', 'browser/native_window_win.cc',
'browser/native_window_win.h', 'browser/native_window_win.h',
'browser/native_window_observer.h', 'browser/native_window_observer.h',
'browser/ui/accelerator_util.cc',
'browser/ui/accelerator_util.h',
'browser/ui/accelerator_util_mac.mm',
'browser/ui/accelerator_util_win.cc',
'browser/ui/file_dialog.h', 'browser/ui/file_dialog.h',
'browser/ui/file_dialog_mac.mm', 'browser/ui/file_dialog_mac.mm',
'browser/ui/file_dialog_win.cc', 'browser/ui/file_dialog_win.cc',

2
browser/api/atom_api_menu.cc
View file

@ -4,8 +4,8 @@
#include "browser/api/atom_api_menu.h" #include "browser/api/atom_api_menu.h"
#include "browser/accelerator_util.h"
#include "browser/api/atom_api_window.h" #include "browser/api/atom_api_window.h"
#include "browser/ui/accelerator_util.h"
#define UNWRAP_MEMNU_AND_CHECK \ #define UNWRAP_MEMNU_AND_CHECK \
Menu* self = ObjectWrap::Unwrap<Menu>(args.This()); \ Menu* self = ObjectWrap::Unwrap<Menu>(args.This()); \

2
browser/accelerator_util.cc → browser/ui/accelerator_util.cc
View file

@ -2,7 +2,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.
#include "browser/accelerator_util.h" #include "browser/ui/accelerator_util.h"
#include <string> #include <string>

6
browser/accelerator_util.h → browser/ui/accelerator_util.h
View file

@ -2,8 +2,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 BROWSER_ACCELERATOR_UTIL_H_ #ifndef BROWSER_UI_ACCELERATOR_UTIL_H_
#define BROWSER_ACCELERATOR_UTIL_H_ #define BROWSER_UI_ACCELERATOR_UTIL_H_
#include <string> #include <string>
@ -22,4 +22,4 @@ void SetPlatformAccelerator(ui::Accelerator* accelerator);
} // namespace accelerator_util } // namespace accelerator_util
#endif // BROWSER_ACCELERATOR_UTIL_H_ #endif // BROWSER_UI_ACCELERATOR_UTIL_H_

2
browser/accelerator_util_mac.mm → browser/ui/accelerator_util_mac.mm
View file

@ -2,7 +2,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.
#include "browser/accelerator_util.h" #include "browser/ui/accelerator_util.h"
#include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator.h"
#import "ui/base/accelerators/platform_accelerator_cocoa.h" #import "ui/base/accelerators/platform_accelerator_cocoa.h"

2
browser/accelerator_util_win.cc → browser/ui/accelerator_util_win.cc
View file

@ -2,7 +2,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.
#include "browser/accelerator_util.h" #include "browser/ui/accelerator_util.h"
#include "ui/base/accelerators/accelerator.h" #include "ui/base/accelerators/accelerator.h"

2
browser/ui/message_box_win.cc
View file

@ -86,7 +86,7 @@ MessageDialog::MessageDialog(NativeWindow* parent_window,
title_(UTF8ToUTF16(title)), title_(UTF8ToUTF16(title)),
widget_(NULL), widget_(NULL),
message_box_view_(NULL) { message_box_view_(NULL) {
DCHECK(buttons.size() > 0); DCHECK_GT(buttons.size(), 0);
set_owned_by_client(); set_owned_by_client();
views::MessageBoxView::InitParams params(UTF8ToUTF16(title)); views::MessageBoxView::InitParams params(UTF8ToUTF16(title));