Remove chrome/ code to handle App Notifications

The sync/ code will be removed in a follow up patch.

BUG=136297
TBR=thakis

Review URL: https://chromiumcodereview.appspot.com/12680004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187201 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 1 insertions, 88 deletions

diff --git a/chrome/renderer/extensions/app_bindings.cc b/chrome/renderer/extensions/app_bindings.cc
index 97472b9..87cc04e 100644
--- a/chrome/renderer/extensions/app_bindings.cc
+++ b/chrome/renderer/extensions/app_bindings.cc
@@ -51,8 +51,6 @@ bool CheckAccessToAppDetails(WebFrame* frame) {
   return true;
 }
 
-const char* kMissingClientIdError = "Missing clientId parameter";
-const char* kInvalidClientIdError = "Invalid clientId";
 const char* kInvalidCallbackIdError = "Invalid callbackId";
 
 }  // namespace
@@ -68,8 +66,6 @@ AppBindings::AppBindings(Dispatcher* dispatcher, ChromeV8Context* context)
       base::Bind(&AppBindings::GetDetails, base::Unretained(this)));
   RouteFunction("GetDetailsForFrame",
       base::Bind(&AppBindings::GetDetailsForFrame, base::Unretained(this)));
-  RouteFunction("GetAppNotifyChannel",
-      base::Bind(&AppBindings::GetAppNotifyChannel, base::Unretained(this)));
   RouteFunction("GetInstallState",
       base::Bind(&AppBindings::GetInstallState, base::Unretained(this)));
   RouteFunction("GetRunningState",
@@ -150,45 +146,6 @@ v8::Handle<v8::Value> AppBindings::GetDetailsForFrameImpl(
                               frame->mainWorldScriptContext());
 }
 
-v8::Handle<v8::Value> AppBindings::GetAppNotifyChannel(
-    const v8::Arguments& args) {
-  // Read the required 'clientId' value out of the object at args[0].
-  std::string client_id;
-  if (args.Length() < 1 || !args[0]->IsObject()) {
-    v8::ThrowException(v8::String::New(kMissingClientIdError));
-    return v8::Undefined();
-  }
-  v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(args[0]);
-  v8::Local<v8::String> client_id_key = v8::String::New("clientId");
-  if (obj->Has(client_id_key)) {
-    v8::String::Utf8Value id_value(obj->Get(client_id_key));
-    if (id_value.length() > 0)
-      client_id = std::string(*id_value);
-  }
-  if (client_id.empty()) {
-    v8::ThrowException(v8::String::New(kInvalidClientIdError));
-    return v8::Undefined();
-  }
-
-  // Get the callbackId if specified.
-  int callback_id = 0;
-  if (args.Length() > 1) {
-    if (!args[1]->IsInt32()) {
-      v8::ThrowException(v8::String::New(kInvalidCallbackIdError));
-      return v8::Undefined();
-    }
-    callback_id = args[1]->Int32Value();
-  }
-
-  content::RenderView* render_view = context_->GetRenderView();
-  CHECK(render_view);
-
-  Send(new ExtensionHostMsg_GetAppNotifyChannel(
-      render_view->GetRoutingID(), context_->web_frame()->document().url(),
-      client_id, GetRoutingID(), callback_id));
-  return v8::Undefined();
-}
-
 v8::Handle<v8::Value> AppBindings::GetInstallState(const v8::Arguments& args) {
   // Get the callbackId.
   int callback_id = 0;
@@ -246,8 +203,6 @@ v8::Handle<v8::Value> AppBindings::GetRunningState(const v8::Arguments& args) {
 
 bool AppBindings::OnMessageReceived(const IPC::Message& message) {
   IPC_BEGIN_MESSAGE_MAP(AppBindings, message)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_GetAppNotifyChannelResponse,
-                        OnGetAppNotifyChannelResponse)
     IPC_MESSAGE_HANDLER(ExtensionMsg_GetAppInstallStateResponse,
                         OnAppInstallStateResponse)
     IPC_MESSAGE_UNHANDLED(CHECK(false) << "Unhandled IPC message")
@@ -255,18 +210,6 @@ bool AppBindings::OnMessageReceived(const IPC::Message& message) {
   return true;
 }
 
-void AppBindings::OnGetAppNotifyChannelResponse(
-    const std::string& channel_id, const std::string& error, int callback_id) {
-  v8::HandleScope handle_scope;
-  v8::Context::Scope context_scope(context_->v8_context());
-  v8::Handle<v8::Value> argv[3];
-  argv[0] = v8::String::New(channel_id.c_str());
-  argv[1] = v8::String::New(error.c_str());
-  argv[2] = v8::Integer::New(callback_id);
-  CHECK(context_->CallChromeHiddenMethod("app.onGetAppNotifyChannelResponse",
-                                         arraysize(argv), argv, NULL));
-}
-
 void AppBindings::OnAppInstallStateResponse(
     const std::string& state, int callback_id) {
   v8::HandleScope handle_scope;
diff --git a/chrome/renderer/extensions/app_bindings.h b/chrome/renderer/extensions/app_bindings.h
index 99028e4..ce00b4f 100644
--- a/chrome/renderer/extensions/app_bindings.h
+++ b/chrome/renderer/extensions/app_bindings.h
@@ -34,15 +34,11 @@ class AppBindings : public ChromeV8Extension,
   v8::Handle<v8::Value> Install(const v8::Arguments& args);
   v8::Handle<v8::Value> GetDetails(const v8::Arguments& args);
   v8::Handle<v8::Value> GetDetailsForFrame(const v8::Arguments& args);
-  v8::Handle<v8::Value> GetAppNotifyChannel(const v8::Arguments& args);
   v8::Handle<v8::Value> GetInstallState(const v8::Arguments& args);
   v8::Handle<v8::Value> GetRunningState(const v8::Arguments& args);
 
   v8::Handle<v8::Value> GetDetailsForFrameImpl(WebKit::WebFrame* frame);
 
-  void OnGetAppNotifyChannelResponse(const std::string& channel_id,
-                                     const std::string& error,
-                                     int callback_id);
   void OnAppInstallStateResponse(const std::string& state, int callback_id);
 
   DISALLOW_COPY_AND_ASSIGN(AppBindings);
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc
index c757e83..19c4488 100644
--- a/chrome/renderer/extensions/dispatcher.cc
+++ b/chrome/renderer/extensions/dispatcher.cc
@@ -368,8 +368,6 @@ void InstallAppBindings(ModuleSystem* module_system,
                         v8::Handle<v8::Object> chrome,
                         v8::Handle<v8::Object> chrome_hidden) {
   module_system->SetLazyField(chrome, "app", "app", "chromeApp");
-  module_system->SetLazyField(chrome, "appNotifications", "app",
-                              "chromeAppNotifications");
   module_system->SetLazyField(chrome_hidden, "app", "app",
                               "chromeHiddenApp");
 }
diff --git a/chrome/renderer/resources/extensions/app_custom_bindings.js b/chrome/renderer/resources/extensions/app_custom_bindings.js
index 0b9dd89..c153ce0 100644
--- a/chrome/renderer/resources/extensions/app_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/app_custom_bindings.js
@@ -28,13 +28,6 @@ app.__defineGetter__('isInstalled', appNatives.GetIsInstalled);
 // Called by app_bindings.cc.
 // This becomes chromeHidden.app
 var chromeHiddenApp = {
-  onGetAppNotifyChannelResponse: function(channelId, error, callbackId) {
-    if (callbackId) {
-      callbacks[callbackId](channelId, error);
-      delete callbacks[callbackId];
-    }
-  },
-
   onInstallStateResponse: function(state, callbackId) {
     if (callbackId) {
       callbacks[callbackId](state);
@@ -43,26 +36,10 @@ var chromeHiddenApp = {
   }
 };
 
-// appNotification stuff.
-//
-// TODO(kalman): move this stuff to its own custom binding.
-// It will be bit tricky since I'll need to look into why there are
-// permissions defined for app notifications, yet this always sets it up?
+// TODO(kalman): move this stuff to its own custom bindings.
 var callbacks = {};
 var nextCallbackId = 1;
 
-// This becomes chrome.appNotifications.
-var appNotifications = {
-  getChannel: function getChannel(clientId, callback) {
-    var callbackId = 0;
-    if (callback) {
-      callbackId = nextCallbackId++;
-      callbacks[callbackId] = callback;
-    }
-    appNatives.GetAppNotifyChannel(clientId, callbackId);
-  }
-};
-
 app.installState = function getInstallState(callback) {
   var callbackId = nextCallbackId++;
   callbacks[callbackId] = callback;
@@ -74,6 +51,5 @@ app.installState = function getInstallState(callback) {
 var availability = GetAvailability('app');
 if (availability.is_available) {
   exports.chromeApp = app;
-  exports.chromeAppNotifications = appNotifications;
   exports.chromeHiddenApp = chromeHiddenApp;
 }