Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(832)

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 893543003: Expose the "Fullscreen" content setting to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase over 889893002, added a test. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h" 10 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 CONTENT_SETTINGS_TYPE_GEOLOCATION, 102 CONTENT_SETTINGS_TYPE_GEOLOCATION,
103 std::string())); 103 std::string()));
104 EXPECT_EQ(CONTENT_SETTING_ASK, 104 EXPECT_EQ(CONTENT_SETTING_ASK,
105 map->GetContentSetting(example_url, 105 map->GetContentSetting(example_url,
106 example_url, 106 example_url,
107 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 107 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
108 std::string())); 108 std::string()));
109 EXPECT_EQ(CONTENT_SETTING_ASK, 109 EXPECT_EQ(CONTENT_SETTING_ASK,
110 map->GetContentSetting(example_url, 110 map->GetContentSetting(example_url,
111 example_url, 111 example_url,
112 CONTENT_SETTINGS_TYPE_FULLSCREEN,
113 std::string()));
114 EXPECT_EQ(CONTENT_SETTING_ASK,
115 map->GetContentSetting(example_url,
116 example_url,
112 CONTENT_SETTINGS_TYPE_MOUSELOCK, 117 CONTENT_SETTINGS_TYPE_MOUSELOCK,
113 std::string())); 118 std::string()));
114 EXPECT_EQ(CONTENT_SETTING_ASK, 119 EXPECT_EQ(CONTENT_SETTING_ASK,
115 map->GetContentSetting(example_url, 120 map->GetContentSetting(example_url,
116 example_url, 121 example_url,
117 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 122 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
118 std::string())); 123 std::string()));
119 EXPECT_EQ(CONTENT_SETTING_ASK, 124 EXPECT_EQ(CONTENT_SETTING_ASK,
120 map->GetContentSetting(example_url, 125 map->GetContentSetting(example_url,
121 example_url, 126 example_url,
(...skipping 15 matching lines...) Expand all
137 EXPECT_EQ(CONTENT_SETTING_ALLOW, 142 EXPECT_EQ(CONTENT_SETTING_ALLOW,
138 map->GetContentSetting( 143 map->GetContentSetting(
139 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); 144 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
140 EXPECT_EQ(CONTENT_SETTING_BLOCK, 145 EXPECT_EQ(CONTENT_SETTING_BLOCK,
141 map->GetContentSetting( 146 map->GetContentSetting(
142 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); 147 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
143 EXPECT_EQ( 148 EXPECT_EQ(
144 CONTENT_SETTING_BLOCK, 149 CONTENT_SETTING_BLOCK,
145 map->GetContentSetting( 150 map->GetContentSetting(
146 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); 151 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
152 EXPECT_EQ(CONTENT_SETTING_ALLOW,
153 map->GetContentSetting(
154 url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string()));
147 EXPECT_EQ(CONTENT_SETTING_BLOCK, 155 EXPECT_EQ(CONTENT_SETTING_BLOCK,
148 map->GetContentSetting( 156 map->GetContentSetting(
149 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string())); 157 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
150 EXPECT_EQ(CONTENT_SETTING_BLOCK, 158 EXPECT_EQ(CONTENT_SETTING_BLOCK,
151 map->GetContentSetting( 159 map->GetContentSetting(
152 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 160 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
153 EXPECT_EQ(CONTENT_SETTING_BLOCK, 161 EXPECT_EQ(CONTENT_SETTING_BLOCK,
154 map->GetContentSetting( 162 map->GetContentSetting(
155 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string())); 163 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
156 } 164 }
(...skipping 23 matching lines...) Expand all
180 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string())); 188 url, url, CONTENT_SETTINGS_TYPE_POPUPS, std::string()));
181 EXPECT_EQ(CONTENT_SETTING_ASK, 189 EXPECT_EQ(CONTENT_SETTING_ASK,
182 map->GetContentSetting( 190 map->GetContentSetting(
183 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string())); 191 url, url, CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string()));
184 EXPECT_EQ( 192 EXPECT_EQ(
185 CONTENT_SETTING_ASK, 193 CONTENT_SETTING_ASK,
186 map->GetContentSetting( 194 map->GetContentSetting(
187 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string())); 195 url, url, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, std::string()));
188 EXPECT_EQ(CONTENT_SETTING_ASK, 196 EXPECT_EQ(CONTENT_SETTING_ASK,
189 map->GetContentSetting( 197 map->GetContentSetting(
198 url, url, CONTENT_SETTINGS_TYPE_FULLSCREEN, std::string()));
199 EXPECT_EQ(CONTENT_SETTING_ASK,
200 map->GetContentSetting(
190 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string())); 201 url, url, CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string()));
191 EXPECT_EQ(CONTENT_SETTING_ASK, 202 EXPECT_EQ(CONTENT_SETTING_ASK,
192 map->GetContentSetting( 203 map->GetContentSetting(
193 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 204 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
194 EXPECT_EQ(CONTENT_SETTING_ASK, 205 EXPECT_EQ(CONTENT_SETTING_ASK,
195 map->GetContentSetting( 206 map->GetContentSetting(
196 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string())); 207 url, url, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string()));
197 } 208 }
198 209
199 private: 210 private:
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 base::FilePath(kBarPath), 262 base::FilePath(kBarPath),
252 base::ASCIIToUTF16("2.3.4"), 263 base::ASCIIToUTF16("2.3.4"),
253 base::ASCIIToUTF16("bar")), 264 base::ASCIIToUTF16("bar")),
254 false); 265 false);
255 266
256 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers")) 267 EXPECT_TRUE(RunExtensionTest("content_settings/getresourceidentifiers"))
257 << message_; 268 << message_;
258 } 269 }
259 270
260 } // namespace extensions 271 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698