refactor: rename the atom namespace to electron

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -827,7 +827,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
     return PROCESS_NONE;
   to_send.append(current_dir.value());
 
-  const std::vector<std::string>& argv = atom::AtomCommandLine::argv();
+  const std::vector<std::string>& argv = electron::AtomCommandLine::argv();
   for (std::vector<std::string>::const_iterator it = argv.begin();
        it != argv.end(); ++it) {
     to_send.push_back(kTokenDelimiter);

chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc

@@ -65,7 +65,7 @@ GlobalMenuBarRegistrarX11::~GlobalMenuBarRegistrarX11() {
 
 void GlobalMenuBarRegistrarX11::RegisterXID(unsigned long xid) {
   DCHECK(registrar_proxy_);
-  std::string path = atom::GlobalMenuBarX11::GetPathForWindow(xid);
+  std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
 
   ANNOTATE_SCOPED_MEMORY_LEAK;  // http://crbug.com/314087
   // TODO(erg): The mozilla implementation goes to a lot of callback trouble
@@ -82,7 +82,7 @@ void GlobalMenuBarRegistrarX11::RegisterXID(unsigned long xid) {
 
 void GlobalMenuBarRegistrarX11::UnregisterXID(unsigned long xid) {
   DCHECK(registrar_proxy_);
-  std::string path = atom::GlobalMenuBarX11::GetPathForWindow(xid);
+  std::string path = electron::GlobalMenuBarX11::GetPathForWindow(xid);
 
   ANNOTATE_SCOPED_MEMORY_LEAK;  // http://crbug.com/314087
   // TODO(erg): The mozilla implementation goes to a lot of callback trouble

shell/app/atom_content_client.cc

@@ -34,7 +34,7 @@
 #include "shell/common/atom_constants.h"
 #endif  // BUILDFLAG(ENABLE_PDF_VIEWER)
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -272,4 +272,4 @@ bool AtomContentClient::IsDataResourceGzipped(int resource_id) const {
   return ui::ResourceBundle::GetSharedInstance().IsGzipped(resource_id);
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/atom_content_client.h

@@ -11,7 +11,7 @@
 
 #include "content/public/common/content_client.h"
 
-namespace atom {
+namespace electron {
 
 class AtomContentClient : public content::ContentClient {
  public:
@@ -37,6 +37,6 @@ class AtomContentClient : public content::ContentClient {
   DISALLOW_COPY_AND_ASSIGN(AtomContentClient);
 };
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_ATOM_CONTENT_CLIENT_H_

shell/app/atom_library_main.mm

@@ -15,11 +15,11 @@
 #include "shell/common/mac/main_application_bundle.h"
 
 int AtomMain(int argc, char* argv[]) {
-  atom::AtomMainDelegate delegate;
+  electron::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
   params.argv = const_cast<const char**>(argv);
-  atom::AtomCommandLine::Init(argc, argv);
+  electron::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }
 
@@ -28,11 +28,11 @@ int AtomInitializeICUandStartNode(int argc, char* argv[]) {
   base::AtExitManager atexit_manager;
   base::mac::ScopedNSAutoreleasePool pool;
   base::mac::SetOverrideFrameworkBundlePath(
-      atom::MainApplicationBundlePath()
+      electron::MainApplicationBundlePath()
           .Append("Contents")
           .Append("Frameworks")
           .Append(ELECTRON_PRODUCT_NAME " Framework.framework"));
   base::i18n::InitializeICU();
-  return atom::NodeMain(argc, argv);
+  return electron::NodeMain(argc, argv);
 }
 #endif

shell/app/atom_main.cc

@@ -125,7 +125,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
 #endif
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  bool run_as_node = IsEnvSet(atom::kRunAsNode);
+  bool run_as_node = IsEnvSet(electron::kRunAsNode);
 #else
   bool run_as_node = false;
 #endif
@@ -158,7 +158,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
   if (run_as_node) {
     base::AtExitManager atexit_manager;
     base::i18n::InitializeICU();
-    auto ret = atom::NodeMain(argv.size(), argv.data());
+    auto ret = electron::NodeMain(argv.size(), argv.data());
     std::for_each(argv.begin(), argv.end(), free);
     return ret;
   }
@@ -171,17 +171,17 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd, int) {
     return crash_service::Main(&argv);
   }
 
-  if (!atom::CheckCommandLineArguments(arguments.argc, arguments.argv))
+  if (!electron::CheckCommandLineArguments(arguments.argc, arguments.argv))
     return -1;
 
   sandbox::SandboxInterfaceInfo sandbox_info = {0};
   content::InitializeSandboxInfo(&sandbox_info);
-  atom::AtomMainDelegate delegate;
+  electron::AtomMainDelegate delegate;
 
   content::ContentMainParams params(&delegate);
   params.instance = instance;
   params.sandbox_info = &sandbox_info;
-  atom::AtomCommandLine::Init(arguments.argc, arguments.argv);
+  electron::AtomCommandLine::Init(arguments.argc, arguments.argv);
   return content::ContentMain(params);
 }
 
@@ -191,18 +191,18 @@ int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (IsEnvSet(atom::kRunAsNode)) {
+  if (IsEnvSet(electron::kRunAsNode)) {
     base::i18n::InitializeICU();
     base::AtExitManager atexit_manager;
-    return atom::NodeMain(argc, argv);
+    return electron::NodeMain(argc, argv);
   }
 #endif
 
-  atom::AtomMainDelegate delegate;
+  electron::AtomMainDelegate delegate;
   content::ContentMainParams params(&delegate);
   params.argc = argc;
   params.argv = const_cast<const char**>(argv);
-  atom::AtomCommandLine::Init(argc, argv);
+  electron::AtomCommandLine::Init(argc, argv);
   return content::ContentMain(params);
 }
 
@@ -212,7 +212,7 @@ int main(int argc, char* argv[]) {
   FixStdioStreams();
 
 #if BUILDFLAG(ENABLE_RUN_AS_NODE)
-  if (IsEnvSet(atom::kRunAsNode)) {
+  if (IsEnvSet(electron::kRunAsNode)) {
     return AtomInitializeICUandStartNode(argc, argv);
   }
 #endif

shell/app/atom_main_delegate.cc

@@ -48,7 +48,7 @@
 #endif
 #endif
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -326,4 +326,4 @@ bool AtomMainDelegate::ShouldCreateFeatureList() {
   return false;
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/atom_main_delegate.h

@@ -11,7 +11,7 @@
 #include "content/public/app/content_main_delegate.h"
 #include "content/public/common/content_client.h"
 
-namespace atom {
+namespace electron {
 
 void LoadResourceBundle(const std::string& locale);
 
@@ -56,6 +56,6 @@ class AtomMainDelegate : public content::ContentMainDelegate {
   DISALLOW_COPY_AND_ASSIGN(AtomMainDelegate);
 };
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_ATOM_MAIN_DELEGATE_H_

shell/app/atom_main_delegate_mac.h

@@ -5,11 +5,11 @@
 #ifndef SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
 #define SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_
 
-namespace atom {
+namespace electron {
 
 // Initializes NSApplication.
 void RegisterAtomCrApp();
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_ATOM_MAIN_DELEGATE_MAC_H_

shell/app/atom_main_delegate_mac.mm

@@ -18,7 +18,7 @@
 #include "shell/common/application_info.h"
 #include "shell/common/mac/main_application_bundle.h"
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -68,4 +68,4 @@ void RegisterAtomCrApp() {
   [AtomApplication sharedApplication];
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/command_line_args.cc

@@ -33,7 +33,7 @@ bool IsUrlArg(const base::CommandLine::CharType* arg) {
 
 }  // namespace
 
-namespace atom {
+namespace electron {
 
 bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
   const base::CommandLine::StringType dashdash(2, '-');
@@ -50,4 +50,4 @@ bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv) {
   return true;
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/command_line_args.h

@@ -7,10 +7,10 @@
 
 #include "base/command_line.h"
 
-namespace atom {
+namespace electron {
 
 bool CheckCommandLineArguments(int argc, base::CommandLine::CharType** argv);
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_COMMAND_LINE_ARGS_H_

shell/app/manifests.cc

@@ -5,7 +5,7 @@
 #include "shell/app/manifests.h"
 
 #include "base/no_destructor.h"
-#include "electron/atom/common/api/api.mojom.h"
+#include "electron/shell/common/api/api.mojom.h"
 #include "printing/buildflags/buildflags.h"
 #include "services/proxy_resolver/public/cpp/manifest.h"
 #include "services/service_manager/public/cpp/manifest_builder.h"
@@ -45,7 +45,7 @@ const service_manager::Manifest& GetElectronContentBrowserOverlayManifest() {
           .ExposeInterfaceFilterCapability_Deprecated(
               "navigation:frame", "renderer",
               service_manager::Manifest::InterfaceList<
-                  atom::mojom::ElectronBrowser>())
+                  electron::mojom::ElectronBrowser>())
           .Build()};
   return *manifest;
 }

shell/app/node_main.cc

@@ -29,7 +29,7 @@
 #include "shell/common/crash_reporter/crash_reporter_win.h"
 #endif
 
-namespace atom {
+namespace electron {
 
 int NodeMain(int argc, char* argv[]) {
   base::CommandLine::Init(argc, argv);
@@ -130,4 +130,4 @@ int NodeMain(int argc, char* argv[]) {
   return exit_code;
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/node_main.h

@@ -5,10 +5,10 @@
 #ifndef SHELL_APP_NODE_MAIN_H_
 #define SHELL_APP_NODE_MAIN_H_
 
-namespace atom {
+namespace electron {
 
 int NodeMain(int argc, char* argv[]);
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_NODE_MAIN_H_

shell/app/uv_task_runner.cc

@@ -8,7 +8,7 @@
 
 #include "base/stl_util.h"
 
-namespace atom {
+namespace electron {
 
 UvTaskRunner::UvTaskRunner(uv_loop_t* loop) : loop_(loop) {}
 
@@ -57,4 +57,4 @@ void UvTaskRunner::OnClose(uv_handle_t* handle) {
   delete reinterpret_cast<uv_timer_t*>(handle);
 }
 
-}  // namespace atom
+}  // namespace electron

shell/app/uv_task_runner.h

@@ -12,7 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "uv.h"  // NOLINT(build/include)
 
-namespace atom {
+namespace electron {
 
 // TaskRunner implementation that posts tasks into libuv's default loop.
 class UvTaskRunner : public base::SingleThreadTaskRunner {
@@ -40,6 +40,6 @@ class UvTaskRunner : public base::SingleThreadTaskRunner {
   DISALLOW_COPY_AND_ASSIGN(UvTaskRunner);
 };
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_APP_UV_TASK_RUNNER_H_

shell/browser/api/atom_api_app.cc

@@ -64,23 +64,23 @@
 #include "shell/browser/ui/cocoa/atom_bundle_mover.h"
 #endif
 
-using atom::Browser;
+using electron::Browser;
 
 namespace mate {
 
 #if defined(OS_WIN)
 template <>
-struct Converter<atom::ProcessIntegrityLevel> {
+struct Converter<electron::ProcessIntegrityLevel> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::ProcessIntegrityLevel value) {
+                                   electron::ProcessIntegrityLevel value) {
     switch (value) {
-      case atom::ProcessIntegrityLevel::Untrusted:
+      case electron::ProcessIntegrityLevel::Untrusted:
         return mate::StringToV8(isolate, "untrusted");
-      case atom::ProcessIntegrityLevel::Low:
+      case electron::ProcessIntegrityLevel::Low:
         return mate::StringToV8(isolate, "low");
-      case atom::ProcessIntegrityLevel::Medium:
+      case electron::ProcessIntegrityLevel::Medium:
         return mate::StringToV8(isolate, "medium");
-      case atom::ProcessIntegrityLevel::High:
+      case electron::ProcessIntegrityLevel::High:
         return mate::StringToV8(isolate, "high");
       default:
         return mate::StringToV8(isolate, "unknown");
@@ -109,9 +109,9 @@ struct Converter<Browser::UserTask> {
   }
 };
 
-using atom::JumpListCategory;
-using atom::JumpListItem;
-using atom::JumpListResult;
+using electron::JumpListCategory;
+using electron::JumpListItem;
+using electron::JumpListResult;
 
 template <>
 struct Converter<JumpListItem::Type> {
@@ -374,7 +374,7 @@ struct Converter<content::CertificateRequestResultType> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -547,7 +547,7 @@ App::App(v8::Isolate* isolate) {
   content::GpuDataManager::GetInstance()->AddObserver(this);
 
   base::ProcessId pid = base::GetCurrentProcId();
-  auto process_metric = std::make_unique<atom::ProcessMetric>(
+  auto process_metric = std::make_unique<electron::ProcessMetric>(
       content::PROCESS_TYPE_BROWSER, base::GetCurrentProcessHandle(),
       base::ProcessMetrics::CreateCurrentProcessMetrics());
   app_metrics_[pid] = std::move(process_metric);
@@ -828,7 +828,7 @@ void App::ChildProcessLaunched(int process_type, base::ProcessHandle handle) {
 #else
   auto metrics = base::ProcessMetrics::CreateProcessMetrics(handle);
 #endif
-  app_metrics_[pid] = std::make_unique<atom::ProcessMetric>(
+  app_metrics_[pid] = std::make_unique<electron::ProcessMetric>(
       process_type, handle, std::move(metrics));
 }
 
@@ -998,7 +998,7 @@ bool App::Relaunch(mate::Arguments* js_args) {
   }
 
   if (!override_argv) {
-    const relauncher::StringVector& argv = atom::AtomCommandLine::argv();
+    const relauncher::StringVector& argv = electron::AtomCommandLine::argv();
     return relauncher::RelaunchApp(argv);
   }
 
@@ -1327,7 +1327,7 @@ int DockBounce(const std::string& type) {
   return request_id;
 }
 
-void DockSetMenu(atom::api::Menu* menu) {
+void DockSetMenu(electron::api::Menu* menu) {
   Browser::Get()->DockSetMenu(menu->model());
 }
 
@@ -1500,7 +1500,7 @@ void App::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
@@ -1510,10 +1510,10 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("App", atom::api::App::GetConstructor(isolate)
+  dict.Set("App", electron::api::App::GetConstructor(isolate)
                       ->GetFunction(context)
                       .ToLocalChecked());
-  dict.Set("app", atom::api::App::Create(isolate));
+  dict.Set("app", electron::api::App::Create(isolate));
 }
 
 }  // namespace

shell/browser/api/atom_api_app.h

@@ -42,7 +42,7 @@ namespace mate {
 class Arguments;
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 #if defined(OS_WIN)
 enum class JumpListResult : int;
@@ -236,7 +236,8 @@ class App : public AtomBrowserClient::Delegate,
   base::FilePath app_path_;
 
   using ProcessMetricMap =
-      std::unordered_map<base::ProcessId, std::unique_ptr<atom::ProcessMetric>>;
+      std::unordered_map<base::ProcessId,
+                         std::unique_ptr<electron::ProcessMetric>>;
   ProcessMetricMap app_metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(App);
@@ -244,6 +245,6 @@ class App : public AtomBrowserClient::Delegate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_APP_H_

shell/browser/api/atom_api_app_mac.mm

@@ -9,7 +9,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -35,4 +35,4 @@ void App::SetAppLogsPath(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_app_mas.mm

@@ -10,7 +10,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -63,4 +63,4 @@ base::RepeatingCallback<void()> App::StartAccessingSecurityScopedResource(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_auto_updater.cc

@@ -31,7 +31,7 @@ struct Converter<base::Time> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -141,11 +141,11 @@ void AutoUpdater::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::AutoUpdater;
+using electron::api::AutoUpdater;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_auto_updater.h

@@ -13,7 +13,7 @@
 #include "shell/browser/auto_updater.h"
 #include "shell/browser/window_list_observer.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -56,6 +56,6 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_AUTO_UPDATER_H_

shell/browser/api/atom_api_browser_view.cc

@@ -19,10 +19,10 @@
 namespace mate {
 
 template <>
-struct Converter<atom::AutoResizeFlags> {
+struct Converter<electron::AutoResizeFlags> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::AutoResizeFlags* auto_resize_flags) {
+                     electron::AutoResizeFlags* auto_resize_flags) {
     mate::Dictionary params;
     if (!ConvertFromV8(isolate, val, &params)) {
       return false;
@@ -31,29 +31,29 @@ struct Converter<atom::AutoResizeFlags> {
     uint8_t flags = 0;
     bool width = false;
     if (params.Get("width", &width) && width) {
-      flags |= atom::kAutoResizeWidth;
+      flags |= electron::kAutoResizeWidth;
     }
     bool height = false;
     if (params.Get("height", &height) && height) {
-      flags |= atom::kAutoResizeHeight;
+      flags |= electron::kAutoResizeHeight;
     }
     bool horizontal = false;
     if (params.Get("horizontal", &horizontal) && horizontal) {
-      flags |= atom::kAutoResizeHorizontal;
+      flags |= electron::kAutoResizeHorizontal;
     }
     bool vertical = false;
     if (params.Get("vertical", &vertical) && vertical) {
-      flags |= atom::kAutoResizeVertical;
+      flags |= electron::kAutoResizeVertical;
     }
 
-    *auto_resize_flags = static_cast<atom::AutoResizeFlags>(flags);
+    *auto_resize_flags = static_cast<electron::AutoResizeFlags>(flags);
     return true;
   }
 };
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -154,11 +154,11 @@ void BrowserView::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::BrowserView;
+using electron::api::BrowserView;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_browser_view.h

@@ -22,7 +22,7 @@ class Arguments;
 class Dictionary;
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 class NativeBrowserView;
 
@@ -73,6 +73,6 @@ class BrowserView : public mate::TrackableObject<BrowserView>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_VIEW_H_

shell/browser/api/atom_api_browser_window.cc

@@ -25,7 +25,7 @@
 #include "shell/common/options_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -456,12 +456,12 @@ v8::Local<v8::Value> BrowserWindow::From(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::BrowserWindow;
-using atom::api::TopLevelWindow;
+using electron::api::BrowserWindow;
+using electron::api::TopLevelWindow;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_browser_window.h

@@ -13,7 +13,7 @@
 #include "shell/browser/api/atom_api_top_level_window.h"
 #include "shell/browser/api/atom_api_web_contents.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -125,6 +125,6 @@ class BrowserWindow : public TopLevelWindow,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_BROWSER_WINDOW_H_

shell/browser/api/atom_api_browser_window_mac.mm

@@ -33,7 +33,7 @@
 
 @end
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -137,4 +137,4 @@ void BrowserWindow::UpdateDraggableRegions(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_browser_window_views.cc

@@ -6,7 +6,7 @@
 
 #include "shell/browser/native_window_views.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -20,4 +20,4 @@ void BrowserWindow::UpdateDraggableRegions(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_content_tracing.cc

@@ -64,13 +64,14 @@ base::Optional<base::FilePath> CreateTemporaryFileOnIO() {
   return base::make_optional(std::move(temp_file_path));
 }
 
-void StopTracing(atom::util::Promise promise,
+void StopTracing(electron::util::Promise promise,
                  base::Optional<base::FilePath> file_path) {
   if (file_path) {
     auto endpoint = TracingController::CreateFileEndpoint(
-        *file_path, base::AdaptCallbackForRepeating(base::BindOnce(
-                        &atom::util::Promise::ResolvePromise<base::FilePath>,
-                        std::move(promise), *file_path)));
+        *file_path,
+        base::AdaptCallbackForRepeating(base::BindOnce(
+            &electron::util::Promise::ResolvePromise<base::FilePath>,
+            std::move(promise), *file_path)));
     TracingController::GetInstance()->StopTracing(endpoint);
   } else {
     promise.RejectWithErrorMessage(
@@ -79,7 +80,7 @@ void StopTracing(atom::util::Promise promise,
 }
 
 v8::Local<v8::Promise> StopRecording(mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
+  electron::util::Promise promise(args->isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   base::FilePath path;
@@ -97,12 +98,12 @@ v8::Local<v8::Promise> StopRecording(mate::Arguments* args) {
 }
 
 v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.
   TracingController::GetInstance()->GetCategories(base::BindOnce(
-      atom::util::Promise::ResolvePromise<const std::set<std::string>&>,
+      electron::util::Promise::ResolvePromise<const std::set<std::string>&>,
       std::move(promise)));
 
   return handle;
@@ -111,22 +112,23 @@ v8::Local<v8::Promise> GetCategories(v8::Isolate* isolate) {
 v8::Local<v8::Promise> StartTracing(
     v8::Isolate* isolate,
     const base::trace_event::TraceConfig& trace_config) {
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   if (!TracingController::GetInstance()->StartTracing(
-          trace_config, base::BindOnce(atom::util::Promise::ResolveEmptyPromise,
-                                       std::move(promise)))) {
+          trace_config,
+          base::BindOnce(electron::util::Promise::ResolveEmptyPromise,
+                         std::move(promise)))) {
     // If StartTracing returns false, that means it didn't invoke its callback.
     // Return an already-resolved promise and abandon the previous promise (it
     // was std::move()d into the StartTracing callback and has been deleted by
     // this point).
-    return atom::util::Promise::ResolvedPromise(isolate);
+    return electron::util::Promise::ResolvedPromise(isolate);
   }
   return handle;
 }
 
-void OnTraceBufferUsageAvailable(atom::util::Promise promise,
+void OnTraceBufferUsageAvailable(electron::util::Promise promise,
                                  float percent_full,
                                  size_t approximate_count) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
@@ -137,7 +139,7 @@ void OnTraceBufferUsageAvailable(atom::util::Promise promise,
 }
 
 v8::Local<v8::Promise> GetTraceBufferUsage(v8::Isolate* isolate) {
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   // Note: This method always succeeds.

shell/browser/api/atom_api_cookies.cc

@@ -74,7 +74,7 @@ struct Converter<network::mojom::CookieChangeCause> {
 
 }  // namespace gin
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -343,4 +343,4 @@ void Cookies::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_cookies.h

@@ -23,7 +23,7 @@ namespace net {
 class URLRequestContextGetter;
 }
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 
@@ -60,6 +60,6 @@ class Cookies : public mate::TrackableObject<Cookies> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_COOKIES_H_

shell/browser/api/atom_api_debugger.cc

@@ -19,7 +19,7 @@
 
 using content::DevToolsAgentHost;
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -65,7 +65,7 @@ void Debugger::DispatchProtocolMessage(DevToolsAgentHost* agent_host,
     if (it == pending_requests_.end())
       return;
 
-    atom::util::Promise promise = std::move(it->second);
+    electron::util::Promise promise = std::move(it->second);
     pending_requests_.erase(it);
 
     base::DictionaryValue* error = nullptr;
@@ -129,7 +129,7 @@ void Debugger::Detach() {
 }
 
 v8::Local<v8::Promise> Debugger::SendCommand(mate::Arguments* args) {
-  atom::util::Promise promise(isolate());
+  electron::util::Promise promise(isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   if (!agent_host_) {
@@ -186,11 +186,11 @@ void Debugger::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Debugger;
+using electron::api::Debugger;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_debugger.h

@@ -25,7 +25,7 @@ namespace mate {
 class Arguments;
 }
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -54,7 +54,7 @@ class Debugger : public mate::TrackableObject<Debugger>,
                               content::RenderFrameHost* new_rfh) override;
 
  private:
-  using PendingRequestMap = std::map<int, atom::util::Promise>;
+  using PendingRequestMap = std::map<int, electron::util::Promise>;
 
   void Attach(mate::Arguments* args);
   bool IsAttached();
@@ -73,6 +73,6 @@ class Debugger : public mate::TrackableObject<Debugger>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_DEBUGGER_H_

shell/browser/api/atom_api_desktop_capturer.cc

@@ -30,22 +30,22 @@
 namespace mate {
 
 template <>
-struct Converter<atom::api::DesktopCapturer::Source> {
+struct Converter<electron::api::DesktopCapturer::Source> {
   static v8::Local<v8::Value> ToV8(
       v8::Isolate* isolate,
-      const atom::api::DesktopCapturer::Source& source) {
+      const electron::api::DesktopCapturer::Source& source) {
     mate::Dictionary dict(isolate, v8::Object::New(isolate));
     content::DesktopMediaID id = source.media_list_source.id;
     dict.Set("name", base::UTF16ToUTF8(source.media_list_source.name));
     dict.Set("id", id.ToString());
     dict.Set("thumbnail",
-             atom::api::NativeImage::Create(
+             electron::api::NativeImage::Create(
                  isolate, gfx::Image(source.media_list_source.thumbnail)));
     dict.Set("display_id", source.display_id);
     if (source.fetch_icon) {
       dict.Set(
           "appIcon",
-          atom::api::NativeImage::Create(
+          electron::api::NativeImage::Create(
               isolate, gfx::Image(GetWindowIcon(source.media_list_source.id))));
     }
     return ConvertToV8(isolate, dict);
@@ -54,7 +54,7 @@ struct Converter<atom::api::DesktopCapturer::Source> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -216,7 +216,7 @@ void DesktopCapturer::BuildPrototype(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
@@ -226,7 +226,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.SetMethod("createDesktopCapturer", &atom::api::DesktopCapturer::Create);
+  dict.SetMethod("createDesktopCapturer",
+                 &electron::api::DesktopCapturer::Create);
 }
 
 }  // namespace

shell/browser/api/atom_api_desktop_capturer.h

@@ -14,7 +14,7 @@
 #include "native_mate/handle.h"
 #include "shell/browser/api/trackable_object.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -73,6 +73,6 @@ class DesktopCapturer : public mate::TrackableObject<DesktopCapturer>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_DESKTOP_CAPTURER_H_

shell/browser/api/atom_api_dialog.cc

@@ -23,11 +23,11 @@
 
 namespace {
 
-int ShowMessageBoxSync(const atom::MessageBoxSettings& settings) {
-  return atom::ShowMessageBoxSync(settings);
+int ShowMessageBoxSync(const electron::MessageBoxSettings& settings) {
+  return electron::ShowMessageBoxSync(settings);
 }
 
-void ResolvePromiseObject(atom::util::Promise promise,
+void ResolvePromiseObject(electron::util::Promise promise,
                           int result,
                           bool checkbox_checked) {
   mate::Dictionary dict = mate::Dictionary::CreateEmpty(promise.isolate());
@@ -38,13 +38,14 @@ void ResolvePromiseObject(atom::util::Promise promise,
   promise.Resolve(dict.GetHandle());
 }
 
-v8::Local<v8::Promise> ShowMessageBox(const atom::MessageBoxSettings& settings,
-                                      mate::Arguments* args) {
+v8::Local<v8::Promise> ShowMessageBox(
+    const electron::MessageBoxSettings& settings,
+    mate::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
-  atom::ShowMessageBox(
+  electron::ShowMessageBox(
       settings, base::BindOnce(&ResolvePromiseObject, std::move(promise)));
 
   return handle;
@@ -60,7 +61,7 @@ void ShowOpenDialogSync(const file_dialog::DialogSettings& settings,
 v8::Local<v8::Promise> ShowOpenDialog(
     const file_dialog::DialogSettings& settings,
     mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
+  electron::util::Promise promise(args->isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
   file_dialog::ShowOpenDialog(settings, std::move(promise));
   return handle;
@@ -76,7 +77,7 @@ void ShowSaveDialogSync(const file_dialog::DialogSettings& settings,
 v8::Local<v8::Promise> ShowSaveDialog(
     const file_dialog::DialogSettings& settings,
     mate::Arguments* args) {
-  atom::util::Promise promise(args->isolate());
+  electron::util::Promise promise(args->isolate());
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   file_dialog::ShowSaveDialog(settings, std::move(promise));
@@ -90,7 +91,7 @@ void Initialize(v8::Local<v8::Object> exports,
   mate::Dictionary dict(context->GetIsolate(), exports);
   dict.SetMethod("showMessageBoxSync", &ShowMessageBoxSync);
   dict.SetMethod("showMessageBox", &ShowMessageBox);
-  dict.SetMethod("showErrorBox", &atom::ShowErrorBox);
+  dict.SetMethod("showErrorBox", &electron::ShowErrorBox);
   dict.SetMethod("showOpenDialogSync", &ShowOpenDialogSync);
   dict.SetMethod("showOpenDialog", &ShowOpenDialog);
   dict.SetMethod("showSaveDialogSync", &ShowSaveDialogSync);

shell/browser/api/atom_api_download_item.cc

@@ -47,7 +47,7 @@ struct Converter<download::DownloadItem::DownloadState> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -233,7 +233,7 @@ mate::Handle<DownloadItem> DownloadItem::Create(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
@@ -243,7 +243,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary(isolate, exports)
-      .Set("DownloadItem", atom::api::DownloadItem::GetConstructor(isolate)
+      .Set("DownloadItem", electron::api::DownloadItem::GetConstructor(isolate)
                                ->GetFunction(context)
                                .ToLocalChecked());
 }

shell/browser/api/atom_api_download_item.h

@@ -15,7 +15,7 @@
 #include "shell/browser/ui/file_dialog.h"
 #include "url/gurl.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -69,6 +69,6 @@ class DownloadItem : public mate::TrackableObject<DownloadItem>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_DOWNLOAD_ITEM_H_

shell/browser/api/atom_api_global_shortcut.cc

@@ -33,7 +33,7 @@ bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
     if (std::find(std::begin(mediaKeys), std::end(mediaKeys),
                   accelerator.key_code()) != std::end(mediaKeys)) {
       bool trusted =
-          atom::api::SystemPreferences::IsTrustedAccessibilityClient(false);
+          electron::api::SystemPreferences::IsTrustedAccessibilityClient(false);
       if (!trusted)
         return true;
     }
@@ -44,7 +44,7 @@ bool RegisteringMediaKeyForUntrustedClient(const ui::Accelerator& accelerator) {
 
 }  // namespace
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -150,7 +150,7 @@ void GlobalShortcut::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
@@ -160,7 +160,7 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
-  dict.Set("globalShortcut", atom::api::GlobalShortcut::Create(isolate));
+  dict.Set("globalShortcut", electron::api::GlobalShortcut::Create(isolate));
 }
 
 }  // namespace

shell/browser/api/atom_api_global_shortcut.h

@@ -15,7 +15,7 @@
 #include "shell/browser/api/trackable_object.h"
 #include "ui/base/accelerators/accelerator.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -53,6 +53,6 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_GLOBAL_SHORTCUT_H_

shell/browser/api/atom_api_in_app_purchase.cc

@@ -69,7 +69,7 @@ struct Converter<in_app_purchase::Product> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -104,7 +104,7 @@ v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
     const std::string& product_id,
     mate::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   int quantity = 1;
@@ -112,7 +112,7 @@ v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
 
   in_app_purchase::PurchaseProduct(
       product_id, quantity,
-      base::BindOnce(atom::util::Promise::ResolvePromise<bool>,
+      base::BindOnce(electron::util::Promise::ResolvePromise<bool>,
                      std::move(promise)));
 
   return handle;
@@ -122,11 +122,11 @@ v8::Local<v8::Promise> InAppPurchase::GetProducts(
     const std::vector<std::string>& productIDs,
     mate::Arguments* args) {
   v8::Isolate* isolate = args->isolate();
-  atom::util::Promise promise(isolate);
+  electron::util::Promise promise(isolate);
   v8::Local<v8::Promise> handle = promise.GetHandle();
 
   in_app_purchase::GetProducts(
-      productIDs, base::BindOnce(atom::util::Promise::ResolvePromise<
+      productIDs, base::BindOnce(electron::util::Promise::ResolvePromise<
                                      std::vector<in_app_purchase::Product>>,
                                  std::move(promise)));
 
@@ -141,11 +141,11 @@ void InAppPurchase::OnTransactionsUpdated(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::InAppPurchase;
+using electron::api::InAppPurchase;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_in_app_purchase.h

@@ -15,7 +15,7 @@
 #include "shell/browser/mac/in_app_purchase_product.h"
 #include "shell/common/promise_util.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -47,6 +47,6 @@ class InAppPurchase : public mate::EventEmitter<InAppPurchase>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_IN_APP_PURCHASE_H_

shell/browser/api/atom_api_menu.cc

@@ -14,7 +14,7 @@
 #include "shell/common/native_mate_converters/string16_converter.h"
 #include "shell/common/node_includes.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -230,11 +230,11 @@ void Menu::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Menu;
+using electron::api::Menu;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_menu.h

@@ -13,7 +13,7 @@
 #include "shell/browser/api/trackable_object.h"
 #include "shell/browser/ui/atom_menu_model.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -117,23 +117,23 @@ class Menu : public mate::TrackableObject<Menu>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace mate {
 
 template <>
-struct Converter<atom::AtomMenuModel*> {
+struct Converter<electron::AtomMenuModel*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::AtomMenuModel** out) {
+                     electron::AtomMenuModel** out) {
     // null would be tranfered to NULL.
     if (val->IsNull()) {
       *out = nullptr;
       return true;
     }
 
-    atom::api::Menu* menu;
-    if (!Converter<atom::api::Menu*>::FromV8(isolate, val, &menu))
+    electron::api::Menu* menu;
+    if (!Converter<electron::api::Menu*>::FromV8(isolate, val, &menu))
       return false;
     *out = menu->model();
     return true;

shell/browser/api/atom_api_menu_mac.h

@@ -14,7 +14,7 @@
 
 using base::scoped_nsobject;
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -53,6 +53,6 @@ class MenuMac : public Menu {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_MENU_MAC_H_

shell/browser/api/atom_api_menu_mac.mm

@@ -26,7 +26,7 @@ static scoped_nsobject<NSMenu> applicationMenu_;
 
 }  // namespace
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -112,7 +112,7 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
   base::mac::ScopedSendingEvent sendingEventScoper;
 
   // Don't emit unresponsive event when showing menu.
-  atom::UnresponsiveSuppressor suppressor;
+  electron::UnresponsiveSuppressor suppressor;
   [menu popUpMenuPositioningItem:item atLocation:position inView:view];
 }
 
@@ -172,4 +172,4 @@ mate::WrappableBase* Menu::New(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_menu_views.cc

@@ -12,7 +12,7 @@
 
 using views::MenuRunner;
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -42,7 +42,7 @@ void MenuViews::PopupAt(TopLevelWindow* window,
   int flags = MenuRunner::CONTEXT_MENU | MenuRunner::HAS_MNEMONICS;
 
   // Don't emit unresponsive event when showing menu.
-  atom::UnresponsiveSuppressor suppressor;
+  electron::UnresponsiveSuppressor suppressor;
 
   // Show the menu.
   int32_t window_id = window->weak_map_id();
@@ -81,4 +81,4 @@ mate::WrappableBase* Menu::New(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_menu_views.h

@@ -13,7 +13,7 @@
 #include "ui/display/screen.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -43,6 +43,6 @@ class MenuViews : public Menu {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_MENU_VIEWS_H_

shell/browser/api/atom_api_net.cc

@@ -7,7 +7,7 @@
 #include "shell/browser/api/atom_api_url_request.h"
 #include "shell/common/node_includes.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -38,12 +38,12 @@ v8::Local<v8::Value> Net::URLRequest(v8::Isolate* isolate) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Net;
-using atom::api::URLRequest;
+using electron::api::Net;
+using electron::api::URLRequest;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_net.h

@@ -7,7 +7,7 @@
 
 #include "shell/browser/api/event_emitter.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -30,6 +30,6 @@ class Net : public mate::EventEmitter<Net> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_NET_H_

shell/browser/api/atom_api_net_log.cc

@@ -20,7 +20,7 @@
 #include "shell/common/native_mate_converters/file_path_converter.h"
 #include "shell/common/node_includes.h"
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -187,4 +187,4 @@ void NetLog::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_net_log.h

@@ -17,7 +17,7 @@
 #include "shell/browser/api/trackable_object.h"
 #include "shell/common/promise_util.h"
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 
@@ -63,6 +63,6 @@ class NetLog : public mate::TrackableObject<NetLog> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_NET_LOG_H_

shell/browser/api/atom_api_notification.cc

@@ -20,10 +20,10 @@
 
 namespace mate {
 template <>
-struct Converter<atom::NotificationAction> {
+struct Converter<electron::NotificationAction> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::NotificationAction* out) {
+                     electron::NotificationAction* out) {
     mate::Dictionary dict;
     if (!ConvertFromV8(isolate, val, &dict))
       return false;
@@ -36,7 +36,7 @@ struct Converter<atom::NotificationAction> {
   }
 
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::NotificationAction val) {
+                                   electron::NotificationAction val) {
     mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("text", val.text);
     dict.Set("type", val.type);
@@ -45,7 +45,7 @@ struct Converter<atom::NotificationAction> {
 };
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -118,7 +118,7 @@ base::string16 Notification::GetSound() const {
   return sound_;
 }
 
-std::vector<atom::NotificationAction> Notification::GetActions() const {
+std::vector<electron::NotificationAction> Notification::GetActions() const {
   return actions_;
 }
 
@@ -156,7 +156,7 @@ void Notification::SetSound(const base::string16& new_sound) {
 }
 
 void Notification::SetActions(
-    const std::vector<atom::NotificationAction>& actions) {
+    const std::vector<electron::NotificationAction>& actions) {
   actions_ = actions;
 }
 
@@ -199,7 +199,7 @@ void Notification::Show() {
   if (presenter_) {
     notification_ = presenter_->CreateNotification(this, base::GenerateGUID());
     if (notification_) {
-      atom::NotificationOptions options;
+      electron::NotificationOptions options;
       options.title = title_;
       options.subtitle = subtitle_;
       options.msg = body_;
@@ -247,11 +247,11 @@ void Notification::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Notification;
+using electron::api::Notification;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_notification.h

@@ -17,7 +17,7 @@
 #include "shell/browser/notifications/notification_presenter.h"
 #include "ui/gfx/image/image.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -55,7 +55,7 @@ class Notification : public mate::TrackableObject<Notification>,
   bool GetHasReply() const;
   base::string16 GetReplyPlaceholder() const;
   base::string16 GetSound() const;
-  std::vector<atom::NotificationAction> GetActions() const;
+  std::vector<electron::NotificationAction> GetActions() const;
   base::string16 GetCloseButtonText() const;
 
   // Prop Setters
@@ -66,7 +66,7 @@ class Notification : public mate::TrackableObject<Notification>,
   void SetHasReply(bool new_has_reply);
   void SetReplyPlaceholder(const base::string16& new_reply_placeholder);
   void SetSound(const base::string16& sound);
-  void SetActions(const std::vector<atom::NotificationAction>& actions);
+  void SetActions(const std::vector<electron::NotificationAction>& actions);
   void SetCloseButtonText(const base::string16& text);
 
  private:
@@ -80,18 +80,18 @@ class Notification : public mate::TrackableObject<Notification>,
   bool has_reply_ = false;
   base::string16 reply_placeholder_;
   base::string16 sound_;
-  std::vector<atom::NotificationAction> actions_;
+  std::vector<electron::NotificationAction> actions_;
   base::string16 close_button_text_;
 
-  atom::NotificationPresenter* presenter_;
+  electron::NotificationPresenter* presenter_;
 
-  base::WeakPtr<atom::Notification> notification_;
+  base::WeakPtr<electron::Notification> notification_;
 
   DISALLOW_COPY_AND_ASSIGN(Notification);
 };
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_NOTIFICATION_H_

shell/browser/api/atom_api_power_monitor.cc

@@ -31,7 +31,7 @@ struct Converter<ui::IdleState> {
 };
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -128,11 +128,11 @@ void PowerMonitor::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::PowerMonitor;
+using electron::api::PowerMonitor;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_power_monitor.h

@@ -11,7 +11,7 @@
 #include "shell/browser/lib/power_observer.h"
 #include "ui/base/idle/idle.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -76,6 +76,6 @@ class PowerMonitor : public mate::TrackableObject<PowerMonitor>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_POWER_MONITOR_H_

shell/browser/api/atom_api_power_monitor_mac.mm

@@ -11,10 +11,10 @@
 
 @interface MacLockMonitor : NSObject {
  @private
-  std::vector<atom::api::PowerMonitor*> emitters;
+  std::vector<electron::api::PowerMonitor*> emitters;
 }
 
-- (void)addEmitter:(atom::api::PowerMonitor*)monitor_;
+- (void)addEmitter:(electron::api::PowerMonitor*)monitor_;
 
 @end
 
@@ -41,7 +41,7 @@
   [super dealloc];
 }
 
-- (void)addEmitter:(atom::api::PowerMonitor*)monitor_ {
+- (void)addEmitter:(electron::api::PowerMonitor*)monitor_ {
   self->emitters.push_back(monitor_);
 }
 
@@ -59,7 +59,7 @@
 
 @end
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -73,4 +73,4 @@ void PowerMonitor::InitPlatformSpecificMonitors() {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_power_monitor_win.cc

@@ -11,7 +11,7 @@
 #include "ui/base/win/shell.h"
 #include "ui/gfx/win/hwnd_util.h"
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -69,4 +69,4 @@ LRESULT CALLBACK PowerMonitor::WndProc(HWND hwnd,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_power_save_blocker.cc

@@ -39,7 +39,7 @@ struct Converter<device::mojom::WakeLockType> {
 
 }  // namespace gin
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -134,7 +134,7 @@ gin::ObjectTemplateBuilder PowerSaveBlocker::GetObjectTemplateBuilder(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
@@ -144,7 +144,8 @@ void Initialize(v8::Local<v8::Object> exports,
                 void* priv) {
   v8::Isolate* isolate = context->GetIsolate();
   gin::Dictionary dict(isolate, exports);
-  dict.Set("powerSaveBlocker", atom::api::PowerSaveBlocker::Create(isolate));
+  dict.Set("powerSaveBlocker",
+           electron::api::PowerSaveBlocker::Create(isolate));
 }
 
 }  // namespace

shell/browser/api/atom_api_power_save_blocker.h

@@ -13,7 +13,7 @@
 #include "gin/wrappable.h"
 #include "services/device/public/mojom/wake_lock.mojom.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -56,6 +56,6 @@ class PowerSaveBlocker : public gin::Wrappable<PowerSaveBlocker> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_POWER_SAVE_BLOCKER_H_

shell/browser/api/atom_api_protocol.cc

@@ -74,7 +74,7 @@ struct Converter<CustomScheme> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -129,14 +129,15 @@ void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
         switch_name, base::JoinString(schemes, ","));
   };
 
-  AppendSchemesToCmdLine(atom::switches::kSecureSchemes, secure_schemes);
-  AppendSchemesToCmdLine(atom::switches::kBypassCSPSchemes,
+  AppendSchemesToCmdLine(electron::switches::kSecureSchemes, secure_schemes);
+  AppendSchemesToCmdLine(electron::switches::kBypassCSPSchemes,
                          cspbypassing_schemes);
-  AppendSchemesToCmdLine(atom::switches::kCORSSchemes, cors_schemes);
-  AppendSchemesToCmdLine(atom::switches::kFetchSchemes, fetch_schemes);
-  AppendSchemesToCmdLine(atom::switches::kServiceWorkerSchemes,
+  AppendSchemesToCmdLine(electron::switches::kCORSSchemes, cors_schemes);
+  AppendSchemesToCmdLine(electron::switches::kFetchSchemes, fetch_schemes);
+  AppendSchemesToCmdLine(electron::switches::kServiceWorkerSchemes,
                          service_worker_schemes);
-  AppendSchemesToCmdLine(atom::switches::kStandardSchemes, g_standard_schemes);
+  AppendSchemesToCmdLine(electron::switches::kStandardSchemes,
+                         g_standard_schemes);
 }
 
 Protocol::Protocol(v8::Isolate* isolate, AtomBrowserContext* browser_context)
@@ -285,20 +286,20 @@ void Protocol::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
 void RegisterSchemesAsPrivileged(v8::Local<v8::Value> val,
                                  mate::Arguments* args) {
-  if (atom::Browser::Get()->is_ready()) {
+  if (electron::Browser::Get()->is_ready()) {
     args->ThrowError(
         "protocol.registerSchemesAsPrivileged should be called before "
         "app is ready");
     return;
   }
 
-  atom::api::RegisterSchemesAsPrivileged(val, args);
+  electron::api::RegisterSchemesAsPrivileged(val, args);
 }
 
 void Initialize(v8::Local<v8::Object> exports,
@@ -308,7 +309,7 @@ void Initialize(v8::Local<v8::Object> exports,
   v8::Isolate* isolate = context->GetIsolate();
   mate::Dictionary dict(isolate, exports);
   dict.SetMethod("registerSchemesAsPrivileged", &RegisterSchemesAsPrivileged);
-  dict.SetMethod("getStandardSchemes", &atom::api::GetStandardSchemes);
+  dict.SetMethod("getStandardSchemes", &electron::api::GetStandardSchemes);
 }
 
 }  // namespace

shell/browser/api/atom_api_protocol.h

@@ -29,7 +29,7 @@ namespace base {
 class DictionaryValue;
 }
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -193,6 +193,6 @@ class Protocol : public mate::TrackableObject<Protocol> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_PROTOCOL_H_

shell/browser/api/atom_api_protocol_ns.cc

@@ -13,7 +13,7 @@
 #include "shell/common/native_mate_converters/once_callback.h"
 #include "shell/common/promise_util.h"
 
-namespace atom {
+namespace electron {
 namespace api {
 
 namespace {
@@ -178,4 +178,4 @@ void ProtocolNS::BuildPrototype(v8::Isolate* isolate,
 }
 
 }  // namespace api
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_protocol_ns.h

@@ -13,7 +13,7 @@
 #include "shell/browser/api/trackable_object.h"
 #include "shell/browser/net/atom_url_loader_factory.h"
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 
@@ -90,6 +90,6 @@ class ProtocolNS : public mate::TrackableObject<ProtocolNS> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_PROTOCOL_NS_H_

shell/browser/api/atom_api_screen.cc

@@ -22,7 +22,7 @@
 #include "ui/display/win/screen_win.h"
 #endif
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -85,13 +85,13 @@ display::Display Screen::GetDisplayMatching(const gfx::Rect& match_rect) {
 
 #if defined(OS_WIN)
 
-static gfx::Rect ScreenToDIPRect(atom::NativeWindow* window,
+static gfx::Rect ScreenToDIPRect(electron::NativeWindow* window,
                                  const gfx::Rect& rect) {
   HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
   return display::win::ScreenWin::ScreenToDIPRect(hwnd, rect);
 }
 
-static gfx::Rect DIPToScreenRect(atom::NativeWindow* window,
+static gfx::Rect DIPToScreenRect(electron::NativeWindow* window,
                                  const gfx::Rect& rect) {
   HWND hwnd = window ? window->GetAcceleratedWidget() : nullptr;
   return display::win::ScreenWin::DIPToScreenRect(hwnd, rect);
@@ -151,11 +151,11 @@ void Screen::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Screen;
+using electron::api::Screen;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_screen.h

@@ -18,7 +18,7 @@ class Rect;
 class Screen;
 }  // namespace gfx
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -54,6 +54,6 @@ class Screen : public mate::EventEmitter<Screen>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_SCREEN_H_

shell/browser/api/atom_api_session.cc

@@ -147,9 +147,9 @@ struct Converter<ClearStorageDataOptions> {
 };
 
 template <>
-struct Converter<atom::VerifyRequestParams> {
+struct Converter<electron::VerifyRequestParams> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::VerifyRequestParams val) {
+                                   electron::VerifyRequestParams val) {
     mate::Dictionary dict = mate::Dictionary::CreateEmpty(isolate);
     dict.Set("hostname", val.hostname);
     dict.Set("certificate", val.certificate);
@@ -161,7 +161,7 @@ struct Converter<atom::VerifyRequestParams> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -610,7 +610,7 @@ v8::Local<v8::Value> Session::Protocol(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
   if (web_request_.IsEmpty()) {
-    auto handle = atom::api::WebRequest::Create(isolate, browser_context());
+    auto handle = electron::api::WebRequest::Create(isolate, browser_context());
     web_request_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, web_request_);
@@ -618,7 +618,7 @@ v8::Local<v8::Value> Session::WebRequest(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> Session::NetLog(v8::Isolate* isolate) {
   if (net_log_.IsEmpty()) {
-    auto handle = atom::api::NetLog::Create(isolate, browser_context());
+    auto handle = electron::api::NetLog::Create(isolate, browser_context());
     net_log_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, net_log_);
@@ -699,18 +699,18 @@ void Session::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Cookies;
-using atom::api::NetLog;
-using atom::api::Protocol;
-using atom::api::Session;
+using electron::api::Cookies;
+using electron::api::NetLog;
+using electron::api::Protocol;
+using electron::api::Session;
 
 v8::Local<v8::Value> FromPartition(const std::string& partition,
                                    mate::Arguments* args) {
-  if (!atom::Browser::Get()->is_ready()) {
+  if (!electron::Browser::Get()->is_ready()) {
     args->ThrowError("Session can only be received when app is ready");
     return v8::Null(args->isolate());
   }

shell/browser/api/atom_api_session.h

@@ -31,7 +31,7 @@ namespace net {
 class ProxyConfig;
 }
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 
@@ -111,6 +111,6 @@ class Session : public mate::TrackableObject<Session>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_SESSION_H_

shell/browser/api/atom_api_system_preferences.cc

@@ -11,7 +11,7 @@
 #include "ui/gfx/animation/animation.h"
 #include "ui/gfx/color_utils.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -129,11 +129,11 @@ void SystemPreferences::BuildPrototype(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::SystemPreferences;
+using electron::api::SystemPreferences;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_system_preferences.h

@@ -24,7 +24,7 @@ namespace base {
 class DictionaryValue;
 }
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -166,6 +166,6 @@ class SystemPreferences : public mate::EventEmitter<SystemPreferences>
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_SYSTEM_PREFERENCES_H_

shell/browser/api/atom_api_system_preferences_mac.mm

@@ -79,7 +79,7 @@ struct Converter<NSAppearance*> {
 };
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -668,4 +668,4 @@ void SystemPreferences::SetAppLevelAppearance(mate::Arguments* args) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_system_preferences_win.cc

@@ -13,7 +13,7 @@
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/win/hwnd_util.h"
 
-namespace atom {
+namespace electron {
 
 namespace {
 
@@ -218,4 +218,4 @@ void SystemPreferences::OnFinishLaunching(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_top_level_window.cc

@@ -38,10 +38,10 @@
 namespace mate {
 
 template <>
-struct Converter<atom::TaskbarHost::ThumbarButton> {
+struct Converter<electron::TaskbarHost::ThumbarButton> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Handle<v8::Value> val,
-                     atom::TaskbarHost::ThumbarButton* out) {
+                     electron::TaskbarHost::ThumbarButton* out) {
     mate::Dictionary dict;
     if (!ConvertFromV8(isolate, val, &dict))
       return false;
@@ -55,7 +55,7 @@ struct Converter<atom::TaskbarHost::ThumbarButton> {
 }  // namespace mate
 #endif
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -1192,11 +1192,11 @@ void TopLevelWindow::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::TopLevelWindow;
+using electron::api::TopLevelWindow;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_top_level_window.h

@@ -19,7 +19,7 @@
 #include "shell/browser/native_window_observer.h"
 #include "shell/common/api/atom_api_native_image.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -258,23 +258,24 @@ class TopLevelWindow : public mate::TrackableObject<TopLevelWindow>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace mate {
 
 template <>
-struct Converter<atom::NativeWindow*> {
+struct Converter<electron::NativeWindow*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::NativeWindow** out) {
+                     electron::NativeWindow** out) {
     // null would be tranfered to NULL.
     if (val->IsNull()) {
       *out = NULL;
       return true;
     }
 
-    atom::api::TopLevelWindow* window;
-    if (!Converter<atom::api::TopLevelWindow*>::FromV8(isolate, val, &window))
+    electron::api::TopLevelWindow* window;
+    if (!Converter<electron::api::TopLevelWindow*>::FromV8(isolate, val,
+                                                           &window))
       return false;
     *out = window->window();
     return true;

shell/browser/api/atom_api_tray.cc

@@ -21,11 +21,11 @@
 namespace mate {
 
 template <>
-struct Converter<atom::TrayIcon::HighlightMode> {
+struct Converter<electron::TrayIcon::HighlightMode> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::TrayIcon::HighlightMode* out) {
-    using HighlightMode = atom::TrayIcon::HighlightMode;
+                     electron::TrayIcon::HighlightMode* out) {
+    using HighlightMode = electron::TrayIcon::HighlightMode;
     std::string mode;
     if (ConvertFromV8(isolate, val, &mode)) {
       if (mode == "always") {
@@ -46,7 +46,7 @@ struct Converter<atom::TrayIcon::HighlightMode> {
 };
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -248,11 +248,11 @@ void Tray::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::Tray;
+using electron::api::Tray;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_tray.h

@@ -23,7 +23,7 @@ class Arguments;
 class Dictionary;
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 class TrayIcon;
 
@@ -87,6 +87,6 @@ class Tray : public mate::TrackableObject<Tray>, public TrayIconObserver {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_TRAY_H_

shell/browser/api/atom_api_url_request.cc

@@ -56,7 +56,7 @@ struct Converter<scoped_refptr<const net::IOBufferWithSize>> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 namespace api {
 
 template <typename Flags>
@@ -493,4 +493,4 @@ void URLRequest::EmitResponseEvent(Args... args) {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_url_request.h

@@ -19,7 +19,7 @@
 #include "shell/browser/api/event_emitter.h"
 #include "shell/browser/api/trackable_object.h"
 
-namespace atom {
+namespace electron {
 
 class AtomURLRequest;
 
@@ -209,6 +209,6 @@ class URLRequest : public mate::EventEmitter<URLRequest> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_URL_REQUEST_H_

shell/browser/api/atom_api_view.cc

@@ -7,7 +7,7 @@
 #include "native_mate/dictionary.h"
 #include "shell/common/node_includes.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -62,11 +62,11 @@ void View::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::View;
+using electron::api::View;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_view.h

@@ -13,7 +13,7 @@
 #include "shell/browser/api/views/atom_api_layout_manager.h"
 #include "ui/views/view.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -52,7 +52,7 @@ class View : public mate::TrackableObject<View> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace mate {
 
@@ -61,8 +61,8 @@ struct Converter<views::View*> {
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
                      views::View** out) {
-    atom::api::View* view;
-    if (!Converter<atom::api::View*>::FromV8(isolate, val, &view))
+    electron::api::View* view;
+    if (!Converter<electron::api::View*>::FromV8(isolate, val, &view))
       return false;
     *out = view->view();
     return true;

shell/browser/api/atom_api_web_contents.cc

@@ -181,10 +181,10 @@ struct Converter<content::SavePageType> {
 };
 
 template <>
-struct Converter<atom::api::WebContents::Type> {
+struct Converter<electron::api::WebContents::Type> {
   static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
-                                   atom::api::WebContents::Type val) {
-    using Type = atom::api::WebContents::Type;
+                                   electron::api::WebContents::Type val) {
+    using Type = electron::api::WebContents::Type;
     std::string type = "";
     switch (val) {
       case Type::BACKGROUND_PAGE:
@@ -213,8 +213,8 @@ struct Converter<atom::api::WebContents::Type> {
 
   static bool FromV8(v8::Isolate* isolate,
                      v8::Local<v8::Value> val,
-                     atom::api::WebContents::Type* out) {
-    using Type = atom::api::WebContents::Type;
+                     electron::api::WebContents::Type* out) {
+    using Type = electron::api::WebContents::Type;
     std::string type;
     if (!ConvertFromV8(isolate, val, &type))
       return false;
@@ -237,7 +237,7 @@ struct Converter<atom::api::WebContents::Type> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -812,7 +812,7 @@ void WebContents::MediaStoppedPlaying(
 
 void WebContents::DidChangeThemeColor(base::Optional<SkColor> theme_color) {
   if (theme_color) {
-    Emit("did-change-theme-color", atom::ToRGBHex(theme_color.value()));
+    Emit("did-change-theme-color", electron::ToRGBHex(theme_color.value()));
   } else {
     Emit("did-change-theme-color", nullptr);
   }
@@ -1318,17 +1318,17 @@ void WebContents::Stop() {
 }
 
 void WebContents::GoBack() {
-  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoBack();
 }
 
 void WebContents::GoForward() {
-  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoForward();
 }
 
 void WebContents::GoToOffset(int offset) {
-  atom::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
+  electron::AtomBrowserClient::SuppressRendererProcessRestartForOnce();
   web_contents()->GetController().GoToOffset(offset);
 }
 
@@ -2131,7 +2131,7 @@ v8::Local<v8::Value> WebContents::DevToolsWebContents(v8::Isolate* isolate) {
 
 v8::Local<v8::Value> WebContents::Debugger(v8::Isolate* isolate) {
   if (debugger_.IsEmpty()) {
-    auto handle = atom::api::Debugger::Create(isolate, web_contents());
+    auto handle = electron::api::Debugger::Create(isolate, web_contents());
     debugger_.Reset(isolate, handle.ToV8());
   }
   return v8::Local<v8::Value>::New(isolate, debugger_);
@@ -2337,11 +2337,11 @@ mate::Handle<WebContents> WebContents::FromOrCreate(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::WebContents;
+using electron::api::WebContents;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_web_contents.h

@@ -48,7 +48,7 @@ namespace network {
 class ResourceRequestBody;
 }
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 class AtomJavaScriptDialogManager;
@@ -573,6 +573,6 @@ class WebContents : public mate::TrackableObject<WebContents>,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_H_

shell/browser/api/atom_api_web_contents_impl.cc

@@ -18,7 +18,7 @@
 // have to isolate the usage of WebContentsImpl into a clean file to fix it:
 // error C2371: 'ssize_t': redefinition; different basic types
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -59,4 +59,4 @@ OffScreenRenderWidgetHostView* WebContents::GetOffScreenRenderWidgetHostView()
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_web_contents_mac.mm

@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -29,4 +29,4 @@ bool WebContents::IsFocused() const {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_web_contents_view.cc

@@ -28,7 +28,7 @@ class WebContentsViewRelay
   explicit WebContentsViewRelay(content::WebContents* contents) {}
   friend class content::WebContentsUserData<WebContentsViewRelay>;
 
-  atom::api::WebContentsView* view_ = nullptr;
+  electron::api::WebContentsView* view_ = nullptr;
 
   WEB_CONTENTS_USER_DATA_KEY_DECL();
 
@@ -39,7 +39,7 @@ WEB_CONTENTS_USER_DATA_KEY_IMPL(WebContentsViewRelay)
 
 }  // namespace
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -112,11 +112,11 @@ void WebContentsView::BuildPrototype(
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 namespace {
 
-using atom::api::WebContentsView;
+using electron::api::WebContentsView;
 
 void Initialize(v8::Local<v8::Object> exports,
                 v8::Local<v8::Value> unused,

shell/browser/api/atom_api_web_contents_view.h

@@ -9,7 +9,7 @@
 #include "native_mate/handle.h"
 #include "shell/browser/api/atom_api_view.h"
 
-namespace atom {
+namespace electron {
 
 class InspectableWebContents;
 
@@ -44,6 +44,6 @@ class WebContentsView : public View, public content::WebContentsObserver {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_WEB_CONTENTS_VIEW_H_

shell/browser/api/atom_api_web_request.cc

@@ -37,7 +37,7 @@ struct Converter<URLPattern> {
 
 }  // namespace mate
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -144,4 +144,4 @@ void WebRequest::BuildPrototype(v8::Isolate* isolate,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/atom_api_web_request.h

@@ -10,7 +10,7 @@
 #include "shell/browser/api/trackable_object.h"
 #include "shell/browser/net/atom_network_delegate.h"
 
-namespace atom {
+namespace electron {
 
 class AtomBrowserContext;
 
@@ -44,6 +44,6 @@ class WebRequest : public mate::TrackableObject<WebRequest> {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_ATOM_API_WEB_REQUEST_H_

shell/browser/api/atom_api_web_view_manager.cc

@@ -12,7 +12,7 @@
 #include "shell/common/node_includes.h"
 #include "shell/common/options_switches.h"
 
-using atom::WebContentsPreferences;
+using electron::WebContentsPreferences;
 
 namespace {
 
@@ -21,14 +21,14 @@ void AddGuest(int guest_instance_id,
               content::WebContents* embedder,
               content::WebContents* guest_web_contents,
               const base::DictionaryValue& options) {
-  auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
+  auto* manager = electron::WebViewManager::GetWebViewManager(embedder);
   if (manager)
     manager->AddGuest(guest_instance_id, element_instance_id, embedder,
                       guest_web_contents);
 
   double zoom_factor;
-  if (options.GetDouble(atom::options::kZoomFactor, &zoom_factor)) {
-    atom::WebContentsZoomController::FromWebContents(guest_web_contents)
+  if (options.GetDouble(electron::options::kZoomFactor, &zoom_factor)) {
+    electron::WebContentsZoomController::FromWebContents(guest_web_contents)
         ->SetDefaultZoomFactor(zoom_factor);
   }
 
@@ -36,7 +36,7 @@ void AddGuest(int guest_instance_id,
 }
 
 void RemoveGuest(content::WebContents* embedder, int guest_instance_id) {
-  auto* manager = atom::WebViewManager::GetWebViewManager(embedder);
+  auto* manager = electron::WebViewManager::GetWebViewManager(embedder);
   if (manager)
     manager->RemoveGuest(guest_instance_id);
 }

shell/browser/api/event.h

@@ -19,7 +19,8 @@ namespace mate {
 
 class Event : public Wrappable<Event>, public content::WebContentsObserver {
  public:
-  using MessageSyncCallback = atom::mojom::ElectronBrowser::MessageSyncCallback;
+  using MessageSyncCallback =
+      electron::mojom::ElectronBrowser::MessageSyncCallback;
   static Handle<Event> Create(v8::Isolate* isolate);
 
   static void BuildPrototype(v8::Isolate* isolate,

shell/browser/api/event_emitter.cc

@@ -48,7 +48,7 @@ v8::Local<v8::Object> CreateJSEvent(
     v8::Isolate* isolate,
     v8::Local<v8::Object> object,
     content::RenderFrameHost* sender,
-    base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback>
+    base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
         callback) {
   v8::Local<v8::Object> event;
   bool use_native_event = sender && callback;

shell/browser/api/event_emitter.h

@@ -26,7 +26,8 @@ v8::Local<v8::Object> CreateJSEvent(
     v8::Isolate* isolate,
     v8::Local<v8::Object> object,
     content::RenderFrameHost* sender,
-    base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback> callback);
+    base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
+        callback);
 v8::Local<v8::Object> CreateCustomEvent(v8::Isolate* isolate,
                                         v8::Local<v8::Object> object,
                                         v8::Local<v8::Object> event);
@@ -80,7 +81,7 @@ class EventEmitter : public Wrappable<T> {
   bool EmitWithSender(
       const base::StringPiece& name,
       content::RenderFrameHost* sender,
-      base::Optional<atom::mojom::ElectronBrowser::MessageSyncCallback>
+      base::Optional<electron::mojom::ElectronBrowser::MessageSyncCallback>
           callback,
       Args&&... args) {
     v8::Locker locker(isolate());

shell/browser/api/frame_subscriber.cc

@@ -15,7 +15,7 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -174,4 +174,4 @@ gfx::Size FrameSubscriber::GetRenderViewSize() const {
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/frame_subscriber.h

@@ -18,7 +18,7 @@ namespace gfx {
 class Image;
 }
 
-namespace atom {
+namespace electron {
 
 namespace api {
 
@@ -70,6 +70,6 @@ class FrameSubscriber : public content::WebContentsObserver,
 
 }  // namespace api
 
-}  // namespace atom
+}  // namespace electron
 
 #endif  // SHELL_BROWSER_API_FRAME_SUBSCRIBER_H_

shell/browser/api/gpu_info_enumerator.cc

@@ -6,7 +6,7 @@
 
 #include <utility>
 
-namespace atom {
+namespace electron {
 
 GPUInfoEnumerator::GPUInfoEnumerator()
     : value_stack(), current(std::make_unique<base::DictionaryValue>()) {}
@@ -124,4 +124,4 @@ std::unique_ptr<base::DictionaryValue> GPUInfoEnumerator::GetDictionary() {
   return std::move(current);
 }
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/gpu_info_enumerator.h

@@ -12,7 +12,7 @@
 #include "base/values.h"
 #include "gpu/config/gpu_info.h"
 
-namespace atom {
+namespace electron {
 
 // This class implements the enumerator for reading all the attributes in
 // GPUInfo into a dictionary.
@@ -56,5 +56,5 @@ class GPUInfoEnumerator final : public gpu::GPUInfo::Enumerator {
   std::unique_ptr<base::DictionaryValue> current;
 };
 
-}  // namespace atom
+}  // namespace electron
 #endif  // SHELL_BROWSER_API_GPU_INFO_ENUMERATOR_H_

shell/browser/api/gpuinfo_manager.cc

@@ -12,7 +12,7 @@
 #include "gpu/config/gpu_info_collector.h"
 #include "shell/browser/api/gpu_info_enumerator.h"
 
-namespace atom {
+namespace electron {
 
 GPUInfoManager* GPUInfoManager::GetInstance() {
   return base::Singleton<GPUInfoManager>::get();
@@ -92,4 +92,4 @@ std::unique_ptr<base::DictionaryValue> GPUInfoManager::EnumerateGPUInfo(
   return enumerator.GetDictionary();
 }
 
-}  // namespace atom
+}  // namespace electron

shell/browser/api/gpuinfo_manager.h

@@ -15,7 +15,7 @@
 #include "shell/common/native_mate_converters/value_converter.h"
 #include "shell/common/promise_util.h"
 
-namespace atom {
+namespace electron {
 
 // GPUInfoManager is a singleton used to manage and fetch GPUInfo
 class GPUInfoManager : public content::GpuDataManagerObserver {
@@ -45,5 +45,5 @@ class GPUInfoManager : public content::GpuDataManagerObserver {
   DISALLOW_COPY_AND_ASSIGN(GPUInfoManager);
 };
 
-}  // namespace atom
+}  // namespace electron
 #endif  // SHELL_BROWSER_API_GPUINFO_MANAGER_H_

shell/browser/api/process_metric.cc

@@ -15,7 +15,7 @@
 extern "C" int sandbox_check(pid_t pid, const char* operation, int type, ...);
 #endif
 
-namespace atom {
+namespace electron {
 
 ProcessMetric::ProcessMetric(int type,
                              base::ProcessHandle handle,
@@ -106,4 +106,4 @@ bool ProcessMetric::IsSandboxed() const {
 
 #endif  // defined(OS_MACOSX)
 
-}  // namespace atom
+}  // namespace electron