refactor: rename the atom namespace to electron
This commit is contained in:
parent
8c4496a9c9
commit
34c4c8d508
531 changed files with 1456 additions and 1428 deletions
|
@ -10,10 +10,10 @@
|
|||
namespace mate {
|
||||
|
||||
template <>
|
||||
struct Converter<atom::BluetoothChooser::DeviceInfo> {
|
||||
struct Converter<electron::BluetoothChooser::DeviceInfo> {
|
||||
static v8::Local<v8::Value> ToV8(
|
||||
v8::Isolate* isolate,
|
||||
const atom::BluetoothChooser::DeviceInfo& val) {
|
||||
const electron::BluetoothChooser::DeviceInfo& val) {
|
||||
mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
|
||||
dict.Set("deviceName", val.device_name);
|
||||
dict.Set("deviceId", val.device_id);
|
||||
|
@ -23,7 +23,7 @@ struct Converter<atom::BluetoothChooser::DeviceInfo> {
|
|||
|
||||
} // namespace mate
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
namespace {
|
||||
|
||||
|
@ -114,9 +114,9 @@ void BluetoothChooser::AddOrUpdateDevice(const std::string& device_id,
|
|||
}
|
||||
}
|
||||
|
||||
std::vector<atom::BluetoothChooser::DeviceInfo>
|
||||
std::vector<electron::BluetoothChooser::DeviceInfo>
|
||||
BluetoothChooser::GetDeviceList() {
|
||||
std::vector<atom::BluetoothChooser::DeviceInfo> vec;
|
||||
std::vector<electron::BluetoothChooser::DeviceInfo> vec;
|
||||
for (const auto& it : device_map_) {
|
||||
DeviceInfo info = {it.first, it.second};
|
||||
vec.push_back(info);
|
||||
|
@ -125,4 +125,4 @@ BluetoothChooser::GetDeviceList() {
|
|||
return vec;
|
||||
}
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "content/public/browser/bluetooth_chooser.h"
|
||||
#include "shell/browser/api/atom_api_web_contents.h"
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
class BluetoothChooser : public content::BluetoothChooser {
|
||||
public:
|
||||
|
@ -45,6 +45,6 @@ class BluetoothChooser : public content::BluetoothChooser {
|
|||
DISALLOW_COPY_AND_ASSIGN(BluetoothChooser);
|
||||
};
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
||||
#endif // SHELL_BROWSER_LIB_BLUETOOTH_CHOOSER_H_
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
#include "base/power_monitor/power_observer.h"
|
||||
#endif // defined(OS_LINUX)
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
typedef PowerObserverLinux PowerObserver;
|
||||
|
@ -21,6 +21,6 @@ typedef PowerObserverLinux PowerObserver;
|
|||
typedef base::PowerObserver PowerObserver;
|
||||
#endif // defined(OS_LINUX)
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
||||
#endif // SHELL_BROWSER_LIB_POWER_OBSERVER_H_
|
||||
|
|
|
@ -29,7 +29,7 @@ std::string get_executable_basename() {
|
|||
|
||||
} // namespace
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
PowerObserverLinux::PowerObserverLinux()
|
||||
: lock_owner_name_(get_executable_basename()), weak_ptr_factory_(this) {
|
||||
|
@ -163,4 +163,4 @@ void PowerObserverLinux::OnSignalConnected(const std::string& /*interface*/,
|
|||
LOG_IF(WARNING, !success) << "Failed to connect to " << signal;
|
||||
}
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include "dbus/message.h"
|
||||
#include "dbus/object_proxy.h"
|
||||
|
||||
namespace atom {
|
||||
namespace electron {
|
||||
|
||||
class PowerObserverLinux : public base::PowerObserver {
|
||||
public:
|
||||
|
@ -49,6 +49,6 @@ class PowerObserverLinux : public base::PowerObserver {
|
|||
DISALLOW_COPY_AND_ASSIGN(PowerObserverLinux);
|
||||
};
|
||||
|
||||
} // namespace atom
|
||||
} // namespace electron
|
||||
|
||||
#endif // SHELL_BROWSER_LIB_POWER_OBSERVER_LINUX_H_
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue