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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 622793002: Group the different permission related methods in the content api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "content/browser/accessibility/browser_accessibility_manager.h" 17 #include "content/browser/accessibility/browser_accessibility_manager.h"
18 #include "content/browser/site_instance_impl.h" 18 #include "content/browser/site_instance_impl.h"
19 #include "content/common/accessibility_mode_enums.h" 19 #include "content/common/accessibility_mode_enums.h"
20 #include "content/common/content_export.h" 20 #include "content/common/content_export.h"
21 #include "content/common/mojo/service_registry_impl.h" 21 #include "content/common/mojo/service_registry_impl.h"
22 #include "content/public/browser/render_frame_host.h" 22 #include "content/public/browser/render_frame_host.h"
23 #include "content/public/common/javascript_message_type.h" 23 #include "content/public/common/javascript_message_type.h"
24 #include "net/http/http_response_headers.h" 24 #include "net/http/http_response_headers.h"
25 #include "third_party/WebKit/public/platform/WebNotificationPermission.h"
26 #include "third_party/WebKit/public/web/WebTextDirection.h" 25 #include "third_party/WebKit/public/web/WebTextDirection.h"
27 #include "ui/accessibility/ax_node_data.h" 26 #include "ui/accessibility/ax_node_data.h"
28 #include "ui/base/page_transition_types.h" 27 #include "ui/base/page_transition_types.h"
29 28
30 #if defined(OS_ANDROID) 29 #if defined(OS_ANDROID)
31 #include "content/browser/mojo/service_registry_android.h" 30 #include "content/browser/mojo/service_registry_android.h"
32 #endif 31 #endif
33 32
34 class GURL; 33 class GURL;
35 struct AccessibilityHostMsg_EventParams; 34 struct AccessibilityHostMsg_EventParams;
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 // Updates the state of this RenderFrameHost and clears any waiting state 440 // Updates the state of this RenderFrameHost and clears any waiting state
442 // that is no longer relevant. 441 // that is no longer relevant.
443 void SetState(RenderFrameHostImplState rfh_state); 442 void SetState(RenderFrameHostImplState rfh_state);
444 443
445 // Returns whether the given URL is allowed to commit in the current process. 444 // Returns whether the given URL is allowed to commit in the current process.
446 // This is a more conservative check than RenderProcessHost::FilterURL, since 445 // This is a more conservative check than RenderProcessHost::FilterURL, since
447 // it will be used to kill processes that commit unauthorized URLs. 446 // it will be used to kill processes that commit unauthorized URLs.
448 bool CanCommitURL(const GURL& url); 447 bool CanCommitURL(const GURL& url);
449 448
450 void PlatformNotificationPermissionRequestDone( 449 void PlatformNotificationPermissionRequestDone(
451 int request_id, blink::WebNotificationPermission permission); 450 int request_id, bool granted);
Bernhard Bauer 2014/10/20 14:57:24 Does this fit on one line? If not, at least put th
Miguel Garcia 2014/10/21 17:17:12 Done.
452 451
453 // Update the the singleton FrameAccessibility instance with a map 452 // Update the the singleton FrameAccessibility instance with a map
454 // from accessibility node id to the frame routing id of a cross-process 453 // from accessibility node id to the frame routing id of a cross-process
455 // iframe. 454 // iframe.
456 void UpdateCrossProcessIframeAccessibility( 455 void UpdateCrossProcessIframeAccessibility(
457 const std::map<int32, int> node_to_frame_routing_id_map); 456 const std::map<int32, int> node_to_frame_routing_id_map);
458 457
459 // Update the the singleton FrameAccessibility instance with a map 458 // Update the the singleton FrameAccessibility instance with a map
460 // from accessibility node id to the browser plugin instance id of a 459 // from accessibility node id to the browser plugin instance id of a
461 // guest WebContents. 460 // guest WebContents.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 569
571 // NOTE: This must be the last member. 570 // NOTE: This must be the last member.
572 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 571 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
573 572
574 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 573 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
575 }; 574 };
576 575
577 } // namespace content 576 } // namespace content
578 577
579 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 578 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698