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

💄 for cpplint.

Browse source
This commit is contained in:
Cheng Zhao 2013-04-14 17:33:44 +08:00
parent 0f6ece2d27
commit 0d8c4dde97
5 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/atom_library_main.h
View file

@ -6,10 +6,8 @@
#define ATOM_APP_ATOM_LIBRARY_MAIN_
extern "C" {
__attribute__ ((visibility ("default")))
__attribute__((visibility("default")))
int AtomMain(int argc, const char* argv[]);
}
#endif // ATOM_APP_ATOM_LIBRARY_MAIN_

5
browser/api/atom_extensions.cc
View file

@ -29,10 +29,9 @@ namespace atom {
#define NODE_EXT_LIST_ITEM NODE_EXT_STRING
#define NODE_EXT_LIST_END NULL};
#include "browser/api/atom_extensions.h"
#include "browser/api/atom_extensions.h" // NOLINT
node::node_module_struct* get_builtin_module(const char *name)
{
node::node_module_struct* get_builtin_module(const char *name) {
char buf[128];
node::node_module_struct *cur = NULL;
snprintf(buf, sizeof(buf), "atom_%s", name);

2
browser/atom_browser_main_parts.h
View file

@ -20,7 +20,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
protected:
virtual void PostEarlyInitialization() OVERRIDE;
virtual void PreMainMessageLoopStart() OVERRIDE;
virtual void PreMainMessageLoopStart() OVERRIDE;
virtual void PreMainMessageLoopRun() OVERRIDE;
private:

3
common/node_bindings.h
View file

@ -32,9 +32,10 @@ class NodeBindings {
bool is_browser_;
private:
DISALLOW_COPY_AND_ASSIGN(NodeBindings);
};
} // namespace at
} // namespace atom
#endif // RAVE_COMMON_NODE_BINDINGS_

4
common/node_bindings_mac.mm
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "node_bindings_mac.h"
#include "common/node_bindings_mac.h"
#include "base/message_loop.h"
#include "content/public/browser/browser_thread.h"
@ -76,7 +76,7 @@ void NodeBindingsMac::UvRunOnce() {
// Deal with uv events.
int r = uv_run(loop_, (uv_run_mode)(UV_RUN_ONCE | UV_RUN_NOWAIT));
if (r == 0 || loop_->stop_flag != 0)
MessageLoop::current()->QuitWhenIdle(); // Quit from uv.
MessageLoop::current()->QuitWhenIdle(); // Quit from uv.
// Tell the worker thread to continue polling.
uv_sem_post(&embed_sem_);