Get rid of Chrome notifications dependency, and instead go through ContentBrowserClient to show U...

chrome/browser/notifications/notifications_prefs_cache.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notifications_prefs_cache.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 
 NotificationsPrefsCache::NotificationsPrefsCache()
         : default_content_setting_(CONTENT_SETTING_DEFAULT),
           is_initialized_(false) {
 }
 
 void NotificationsPrefsCache::CacheAllowedOrigin(
     const GURL& origin) {
   CheckThreadAccess();
   std::set<GURL>::iterator iter;
@@ skipping 33 matching lines @@
     const ListValue& origin_list,
     std::vector<GURL>* origin_vector) {
   ListValue::const_iterator i;
   std::string origin;
   for (i = origin_list.begin(); i != origin_list.end(); ++i) {
     (*i)->GetAsString(&origin);
     origin_vector->push_back(GURL(origin));
   }
 }
 
-int NotificationsPrefsCache::HasPermission(const GURL& origin) {
+WebKit::WebNotificationPresenter::Permission
+      NotificationsPrefsCache::HasPermission(const GURL& origin) {
   if (IsOriginAllowed(origin))
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (IsOriginDenied(origin))
     return WebKit::WebNotificationPresenter::PermissionDenied;
   switch (default_content_setting_) {
     case CONTENT_SETTING_ALLOW:
       return WebKit::WebNotificationPresenter::PermissionAllowed;
     case CONTENT_SETTING_BLOCK:
       return WebKit::WebNotificationPresenter::PermissionDenied;
     case CONTENT_SETTING_ASK:
@@ skipping 17 matching lines @@
   return denied_origins_.find(origin) != denied_origins_.end();
 }
 
 void NotificationsPrefsCache::CheckThreadAccess() {
   if (is_initialized_) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   } else {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   }
 }