diff options
| author | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 08:19:27 +0000 |
|---|---|---|
| committer | marja@chromium.org <marja@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 08:19:27 +0000 |
| commit | 1d03fa3b98dccd9f18c42a4fd65bbcff728218dd (patch) | |
| tree | 8448f32ee0fb81f5aede76f020fab77e35bbe504 /chrome/browser/geolocation | |
| parent | 03d2069b77ade5f2c5d47a5f74f2c97ffdf1acbf (diff) | |
| download | chromium_src-1d03fa3b98dccd9f18c42a4fd65bbcff728218dd.zip chromium_src-1d03fa3b98dccd9f18c42a4fd65bbcff728218dd.tar.gz chromium_src-1d03fa3b98dccd9f18c42a4fd65bbcff728218dd.tar.bz2 | |
Moving ContentSettingsPattern and ContentSettingsPatternParser from chrome/browser/content_settings to chrome/common.
This is needed for transmitting image-related content settings to the renderer.
BUG=81179
TEST=NONE
Review URL: http://codereview.chromium.org/7885006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation')
| -rw-r--r-- | chrome/browser/geolocation/geolocation_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 4376a82..d13da5a 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -5,10 +5,9 @@ #include <string> #include "base/compiler_specific.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/content_settings/content_settings_pattern.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/dom_operation_notification_details.h" @@ -22,6 +21,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" +#include "chrome/common/content_settings_pattern.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h" |