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

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

Issue 2576613003: Minor, unrelated changes from the browser side mixed-content patch. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « no previous file | chrome/common/render_messages.h » ('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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 10 matching lines...) Expand all
21 #include "components/content_settings/core/browser/content_settings_observer.h" 21 #include "components/content_settings/core/browser/content_settings_observer.h"
22 #include "components/content_settings/core/browser/content_settings_usages_state .h" 22 #include "components/content_settings/core/browser/content_settings_usages_state .h"
23 #include "components/content_settings/core/common/content_settings.h" 23 #include "components/content_settings/core/common/content_settings.h"
24 #include "components/content_settings/core/common/content_settings_types.h" 24 #include "components/content_settings/core/common/content_settings_types.h"
25 #include "content/public/browser/web_contents_observer.h" 25 #include "content/public/browser/web_contents_observer.h"
26 #include "content/public/browser/web_contents_user_data.h" 26 #include "content/public/browser/web_contents_user_data.h"
27 #include "net/cookies/canonical_cookie.h" 27 #include "net/cookies/canonical_cookie.h"
28 28
29 class HostContentSettingsMap; 29 class HostContentSettingsMap;
30 30
31 namespace content {
32 class NavigationHandle;
33 }
34
31 namespace net { 35 namespace net {
32 class CookieOptions; 36 class CookieOptions;
33 } 37 }
34 38
35 // TODO(msramek): Subresource filter and media currently are storing their state 39 // TODO(msramek): Subresource filter and media currently are storing their state
36 // in TabSpecificContentSettings: |microphone_camera_state_| and 40 // in TabSpecificContentSettings: |microphone_camera_state_| and
37 // |subresource_filter_enabled_| without being tied either to a single content 41 // |subresource_filter_enabled_| without being tied either to a single content
38 // setting or to any content setting. This state is not ideal, potential 42 // setting or to any content setting. This state is not ideal, potential
39 // solution is to save this information via content::WebContentsUserData 43 // solution is to save this information via content::WebContentsUserData
40 44
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 // Holds the previous committed url during a navigation. 490 // Holds the previous committed url during a navigation.
487 GURL previous_url_; 491 GURL previous_url_;
488 492
489 // Observer to watch for content settings changed. 493 // Observer to watch for content settings changed.
490 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_; 494 ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
491 495
492 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings); 496 DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
493 }; 497 };
494 498
495 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_ 499 #endif // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698