diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/DEPS | 1 | ||||
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_webkit_preferences.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/extensions/gpu_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/chrome_pref_service_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/printing/print_dialog_cloud.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/prefs/prefs_tab_helper.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/task_manager/task_manager_handler.cc | 2 |
8 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 48d2d39..231d637 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -70,6 +70,7 @@ include_rules = [ "+webkit/glue/webdropdata.h", "+webkit/glue/webkit_glue.h", "+webkit/glue/webmenuitem.h", + "+webkit/glue/webpreferences.h", # DO NOT ADD ANY MORE ITEMS TO THE ABOVE LIST! "-chrome/browser/ui/views", diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 568351e..d46465a 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -130,7 +130,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/message_center/message_center_util.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" #include "webkit/plugins/plugin_switches.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc index 025dcc5..0e32402 100644 --- a/chrome/browser/extensions/extension_webkit_preferences.cc +++ b/chrome/browser/extensions/extension_webkit_preferences.cc @@ -8,7 +8,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" namespace extension_webkit_preferences { diff --git a/chrome/browser/extensions/gpu_browsertest.cc b/chrome/browser/extensions/gpu_browsertest.cc index ff34a35..90ce72232 100644 --- a/chrome/browser/extensions/gpu_browsertest.cc +++ b/chrome/browser/extensions/gpu_browsertest.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "content/public/browser/render_view_host.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" // Tests that GPU acceleration is disabled for extension background // pages. See crbug.com/163698 . diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc index f6a24a8..ffe54f7 100644 --- a/chrome/browser/prefs/chrome_pref_service_unittest.cc +++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc @@ -26,7 +26,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/web_contents_tester.h" #include "ui/base/test/data/resource.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" using content::BrowserThread; using content::WebContentsTester; diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 4e573c2..9b2c0c9 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -38,7 +38,7 @@ #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" #if defined(USE_AURA) #include "ui/aura/root_window.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 3a77806..ea01b78 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -27,7 +27,7 @@ #include "grit/platform_locale_settings.h" #include "third_party/icu/public/common/unicode/uchar.h" #include "third_party/icu/public/common/unicode/uscript.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES) #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc index afb3960..83e54a1 100644 --- a/chrome/browser/ui/webui/task_manager/task_manager_handler.cc +++ b/chrome/browser/ui/webui/task_manager/task_manager_handler.cc @@ -22,7 +22,7 @@ #include "content/public/browser/web_ui.h" #include "ui/gfx/image/image_skia.h" #include "ui/webui/web_ui_util.h" -#include "webkit/common/webpreferences.h" +#include "webkit/glue/webpreferences.h" namespace { |