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

Renames to avoid confusion, add file

Browse source
This commit is contained in:
Paul Betts 2015-10-19 11:47:38 -07:00
parent 05b22b9372
commit d3b23a2032
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
atom/browser/chrome_process_finder_win.cc → atom/browser/atom_process_finder_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 "chrome/browser/chrome_process_finder_win.h" #include "atom/browser/atom_process_finder_win.h"
#include <shellapi.h> #include <shellapi.h>
#include <string> #include <string>
@ -20,8 +20,6 @@
#include "base/win/scoped_handle.h" #include "base/win/scoped_handle.h"
#include "base/win/win_util.h" #include "base/win/win_util.h"
#include "base/win/windows_version.h" #include "base/win/windows_version.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
namespace { namespace {
@ -30,14 +28,14 @@ int timeout_in_milliseconds = 20 * 1000;
} // namespace } // namespace
namespace chrome { namespace atom {
HWND FindRunningChromeWindow(const base::FilePath& user_data_dir) { HWND FindRunningAtomWindow(const base::FilePath& user_data_dir) {
return base::win::MessageWindow::FindWindow(user_data_dir.value()); return base::win::MessageWindow::FindWindow(user_data_dir.value());
} }
NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, NotifyChromeResult AttemptToNotifyRunningAtom(HWND remote_window,
bool fast_start) { bool fast_start) {
DCHECK(remote_window); DCHECK(remote_window);
DWORD process_id = 0; DWORD process_id = 0;
DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id); DWORD thread_id = GetWindowThreadProcessId(remote_window, &process_id);

12
atom/browser/chrome_process_finder_win.h → atom/browser/atom_process_finder_win.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 CHROME_BROWSER_CHROME_PROCESS_FINDER_WIN_H_ #ifndef ATOM_BROWSER_ATOM_PROCESS_FINDER_WIN_H_
#define CHROME_BROWSER_CHROME_PROCESS_FINDER_WIN_H_ #define ATOM_BROWSER_ATOM_PROCESS_FINDER_WIN_H_
#include <windows.h> #include <windows.h>
@ -13,7 +13,7 @@ namespace base {
class FilePath; class FilePath;
} }
namespace chrome { namespace atom {
enum NotifyChromeResult { enum NotifyChromeResult {
NOTIFY_SUCCESS, NOTIFY_SUCCESS,
@ -22,13 +22,13 @@ enum NotifyChromeResult {
}; };
// Finds an already running Chrome window if it exists. // Finds an already running Chrome window if it exists.
HWND FindRunningChromeWindow(const base::FilePath& user_data_dir); HWND FindRunningAtomWindow(const base::FilePath& user_data_dir);
// Attempts to send the current command line to an already running instance of // Attempts to send the current command line to an already running instance of
// Chrome via a WM_COPYDATA message. // Chrome via a WM_COPYDATA message.
// Returns true if a running Chrome is found and successfully notified. // Returns true if a running Chrome is found and successfully notified.
// |fast_start| is true when this is being called on the window fast start path. // |fast_start| is true when this is being called on the window fast start path.
NotifyChromeResult AttemptToNotifyRunningChrome(HWND remote_window, NotifyChromeResult AttemptToNotifyRunningAtom(HWND remote_window,
bool fast_start); bool fast_start);
// Changes the notification timeout to |new_timeout|, returns the old timeout. // Changes the notification timeout to |new_timeout|, returns the old timeout.
@ -36,4 +36,4 @@ base::TimeDelta SetNotificationTimeoutForTesting(base::TimeDelta new_timeout);
} // namespace chrome } // namespace chrome
#endif // CHROME_BROWSER_CHROME_PROCESS_FINDER_WIN_H_ #endif // ATOM_BROWSER_ATOM_PROCESS_FINDER_WIN_H_

1
filenames.gypi
View file

@ -128,6 +128,7 @@
'atom/browser/atom_browser_main_parts.h', 'atom/browser/atom_browser_main_parts.h',
'atom/browser/atom_browser_main_parts_mac.mm', 'atom/browser/atom_browser_main_parts_mac.mm',
'atom/browser/atom_browser_main_parts_posix.cc', 'atom/browser/atom_browser_main_parts_posix.cc',
'atom/browser/atom_process_finder_win.cc',
'atom/browser/atom_javascript_dialog_manager.cc', 'atom/browser/atom_javascript_dialog_manager.cc',
'atom/browser/atom_javascript_dialog_manager.h', 'atom/browser/atom_javascript_dialog_manager.h',
'atom/browser/atom_quota_permission_context.cc', 'atom/browser/atom_quota_permission_context.cc',