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

Side by Side Diff: trunk/src/chrome/browser/content_settings/tab_specific_content_settings.h

Issue 24024006: Revert 221424 "Save password functionality added to the save pas..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 5 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 6 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 const ContentSettingsUsagesState& geolocation_usages_state() const { 215 const ContentSettingsUsagesState& geolocation_usages_state() const {
216 return geolocation_usages_state_; 216 return geolocation_usages_state_;
217 } 217 }
218 218
219 // Returns the ContentSettingsUsageState that controls the MIDI usage on 219 // Returns the ContentSettingsUsageState that controls the MIDI usage on
220 // this page. 220 // this page.
221 const ContentSettingsUsagesState& midi_usages_state() const { 221 const ContentSettingsUsagesState& midi_usages_state() const {
222 return midi_usages_state_; 222 return midi_usages_state_;
223 } 223 }
224 224
225 void OnPasswordSubmitted(PasswordFormManager* form_to_save);
226
225 // Call to indicate that there is a protocol handler pending user approval. 227 // Call to indicate that there is a protocol handler pending user approval.
226 void set_pending_protocol_handler(const ProtocolHandler& handler) { 228 void set_pending_protocol_handler(const ProtocolHandler& handler) {
227 pending_protocol_handler_ = handler; 229 pending_protocol_handler_ = handler;
228 } 230 }
229 231
230 const ProtocolHandler& pending_protocol_handler() const { 232 const ProtocolHandler& pending_protocol_handler() const {
231 return pending_protocol_handler_; 233 return pending_protocol_handler_;
232 } 234 }
233 235
234 void ClearPendingProtocolHandler() { 236 void ClearPendingProtocolHandler() {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 int64 frame_id, 290 int64 frame_id,
289 int64 parent_frame_id, 291 int64 parent_frame_id,
290 bool is_main_frame, 292 bool is_main_frame,
291 const GURL& validated_url, 293 const GURL& validated_url,
292 bool is_error_page, 294 bool is_error_page,
293 bool is_iframe_srcdoc, 295 bool is_iframe_srcdoc,
294 content::RenderViewHost* render_view_host) OVERRIDE; 296 content::RenderViewHost* render_view_host) OVERRIDE;
295 virtual void AppCacheAccessed(const GURL& manifest_url, 297 virtual void AppCacheAccessed(const GURL& manifest_url,
296 bool blocked_by_policy) OVERRIDE; 298 bool blocked_by_policy) OVERRIDE;
297 299
298 // If user clicks on 'save password' this will have the password saved upon
299 // the next navigation.
300 bool PasswordAccepted();
301
302 // If user clicks on 'never save password for this site' this have the
303 // password blacklisted upon the next navigation.
304 bool PasswordFormBlacklisted();
305
306 // Message handlers. Public for testing. 300 // Message handlers. Public for testing.
307 void OnContentBlocked(ContentSettingsType type, 301 void OnContentBlocked(ContentSettingsType type,
308 const std::string& resource_identifier); 302 const std::string& resource_identifier);
309 void OnContentAllowed(ContentSettingsType type); 303 void OnContentAllowed(ContentSettingsType type);
310 304
311 // These methods are invoked on the UI thread by the static functions above. 305 // These methods are invoked on the UI thread by the static functions above.
312 // Public for testing. 306 // Public for testing.
313 void OnCookiesRead(const GURL& url, 307 void OnCookiesRead(const GURL& url,
314 const GURL& first_party_url, 308 const GURL& first_party_url,
315 const net::CookieList& cookie_list, 309 const net::CookieList& cookie_list,
(...skipping 19 matching lines...) Expand all
335 bool allowed); 329 bool allowed);
336 330
337 // This method is called to update the status about the microphone and 331 // This method is called to update the status about the microphone and
338 // camera stream access. |request_permissions| contains a list of requested 332 // camera stream access. |request_permissions| contains a list of requested
339 // media stream types and the permission for each type. 333 // media stream types and the permission for each type.
340 void OnMediaStreamPermissionSet( 334 void OnMediaStreamPermissionSet(
341 const GURL& request_origin, 335 const GURL& request_origin,
342 const MediaStreamDevicesController::MediaStreamTypePermissionMap& 336 const MediaStreamDevicesController::MediaStreamTypePermissionMap&
343 request_permissions); 337 request_permissions);
344 338
345 // This method is called to pass the |form_to_save| on a successful password
346 // submission. It also updates the status of the save password content
347 // setting.
348 void OnPasswordSubmitted(PasswordFormManager* form_to_save);
349
350 // There methods are called to update the status about MIDI access. 339 // There methods are called to update the status about MIDI access.
351 void OnMIDISysExAccessed(const GURL& reqesting_origin); 340 void OnMIDISysExAccessed(const GURL& reqesting_origin);
352 void OnMIDISysExAccessBlocked(const GURL& requesting_origin); 341 void OnMIDISysExAccessBlocked(const GURL& requesting_origin);
353 342
354 // Adds the given |SiteDataObserver|. The |observer| is notified when a 343 // Adds the given |SiteDataObserver|. The |observer| is notified when a
355 // locale shared object, like for example a cookie, is accessed. 344 // locale shared object, like for example a cookie, is accessed.
356 void AddSiteDataObserver(SiteDataObserver* observer); 345 void AddSiteDataObserver(SiteDataObserver* observer);
357 346
358 // Removes the given |SiteDataObserver|. 347 // Removes the given |SiteDataObserver|.
359 void RemoveSiteDataObserver(SiteDataObserver* observer); 348 void RemoveSiteDataObserver(SiteDataObserver* observer);
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 // Stores whether the user can load blocked plugins on this page. 410 // Stores whether the user can load blocked plugins on this page.
422 bool load_plugins_link_enabled_; 411 bool load_plugins_link_enabled_;
423 412
424 content::NotificationRegistrar registrar_; 413 content::NotificationRegistrar registrar_;
425 414
426 // The origin of the media stream request. Note that we only support handling 415 // The origin of the media stream request. Note that we only support handling
427 // settings for one request per tab. The latest request's origin will be 416 // settings for one request per tab. The latest request's origin will be
428 // stored here. http://crbug.com/259794 417 // stored here. http://crbug.com/259794
429 GURL media_stream_access_origin_; 418 GURL media_stream_access_origin_;
430 419
431 // The PasswordFormManager managing the form we're asking the user about,
432 // and should update as per the decision.
433 scoped_ptr<PasswordFormManager> form_to_save_;
434
435 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 420 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
436 }; 421 };
437 422
438 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 423 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/browser/content_settings/tab_specific_content_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698