diff --git a/browser/api/atom_api_window.cc b/browser/api/atom_api_window.cc index 0b00d780d7c9..b2fa5f2d5150 100644 --- a/browser/api/atom_api_window.cc +++ b/browser/api/atom_api_window.cc @@ -614,11 +614,11 @@ void Window::Initialize(v8::Handle target) { NODE_SET_PROTOTYPE_METHOD(t, "isLoading", IsLoading); NODE_SET_PROTOTYPE_METHOD(t, "isWaitingForResponse", IsWaitingForResponse); NODE_SET_PROTOTYPE_METHOD(t, "stop", Stop); - NODE_SET_PROTOTYPE_METHOD(t, "getRoutingID", GetRoutingID); - NODE_SET_PROTOTYPE_METHOD(t, "getProcessID", GetProcessID); + NODE_SET_PROTOTYPE_METHOD(t, "getRoutingId", GetRoutingID); + NODE_SET_PROTOTYPE_METHOD(t, "getProcessId", GetProcessID); - NODE_SET_PROTOTYPE_METHOD(t, "loadURL", LoadURL); - NODE_SET_PROTOTYPE_METHOD(t, "getURL", GetURL); + NODE_SET_PROTOTYPE_METHOD(t, "loadUrl", LoadURL); + NODE_SET_PROTOTYPE_METHOD(t, "getUrl", GetURL); NODE_SET_PROTOTYPE_METHOD(t, "canGoBack", CanGoBack); NODE_SET_PROTOTYPE_METHOD(t, "canGoForward", CanGoForward); NODE_SET_PROTOTYPE_METHOD(t, "canGoToOffset", CanGoToOffset); diff --git a/browser/atom/rpc_server.coffee b/browser/atom/rpc_server.coffee index bbcc2f3cfa45..c1fd0d434795 100644 --- a/browser/atom/rpc_server.coffee +++ b/browser/atom/rpc_server.coffee @@ -50,8 +50,8 @@ ipc.on 'ATOM_BROWSER_CURRENT_WINDOW', (event, processId, routingId) -> try windows = objectsRegistry.getAllWindows() for window in windows - break if window.getProcessID() == processId and - window.getRoutingID() == routingId + break if window.getProcessId() == processId and + window.getRoutingId() == routingId event.result = new Meta(processId, routingId, window) catch e event.result = type: 'error', value: e.message diff --git a/browser/default_app/main.js b/browser/default_app/main.js index 721caeb619e5..e8daddefc173 100644 --- a/browser/default_app/main.js +++ b/browser/default_app/main.js @@ -21,7 +21,7 @@ ipc.on('sync-message', function(event, process_id, routing_id) { atom.browserMainParts.preMainMessageLoopRun = function() { mainWindow = new Window({ width: 800, height: 600 }); - mainWindow.loadURL('file://' + __dirname + '/index.html'); + mainWindow.loadUrl('file://' + __dirname + '/index.html'); mainWindow.on('page-title-updated', function(event, title) { event.preventDefault();