diff options
author | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:44:37 +0000 |
---|---|---|
committer | abarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-17 06:44:37 +0000 |
commit | 8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60 (patch) | |
tree | 605e02a07a66e61c4fb1f645b2f87da200d56fd8 /chrome/browser/notifications | |
parent | e65e8bac10ca2828444a5cffb8890fe065bc06fa (diff) | |
download | chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.zip chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.tar.gz chromium_src-8bd0fe6f88b7f6f1cc8c7b7c4c2474669d8d6d60.tar.bz2 |
Roll WebKit DEPS past WebKit move. Update gyp files and include paths to reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index a1eaeb3..a60c9b1 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -36,7 +36,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" -#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" using WebKit::WebNotificationPresenter; using WebKit::WebTextDirection; diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h index bb6691b..e208be3 100644 --- a/chrome/browser/notifications/desktop_notification_service.h +++ b/chrome/browser/notifications/desktop_notification_service.h @@ -17,7 +17,7 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "googleurl/src/gurl.h" -#include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" class Notification; class NotificationUIManager; diff --git a/chrome/browser/notifications/desktop_notification_service_unittest.cc b/chrome/browser/notifications/desktop_notification_service_unittest.cc index 64ad3fc..05a3dd5 100644 --- a/chrome/browser/notifications/desktop_notification_service_unittest.cc +++ b/chrome/browser/notifications/desktop_notification_service_unittest.cc @@ -16,7 +16,7 @@ #include "chrome/test/testing_profile.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" namespace { diff --git a/chrome/browser/notifications/notifications_prefs_cache.cc b/chrome/browser/notifications/notifications_prefs_cache.cc index b41dc38..b7cd5f5 100644 --- a/chrome/browser/notifications/notifications_prefs_cache.cc +++ b/chrome/browser/notifications/notifications_prefs_cache.cc @@ -10,7 +10,7 @@ #include "base/values.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" -#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" NotificationsPrefsCache::NotificationsPrefsCache() : default_content_setting_(CONTENT_SETTING_DEFAULT), diff --git a/chrome/browser/notifications/notifications_prefs_cache_unittest.cc b/chrome/browser/notifications/notifications_prefs_cache_unittest.cc index d3bbf7d..a6dcea9 100644 --- a/chrome/browser/notifications/notifications_prefs_cache_unittest.cc +++ b/chrome/browser/notifications/notifications_prefs_cache_unittest.cc @@ -7,7 +7,7 @@ #include "base/message_loop.h" #include "chrome/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h" +#include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" TEST(NotificationsPrefsCacheTest, CanCreate) { scoped_refptr<NotificationsPrefsCache> cache(new NotificationsPrefsCache()); |