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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 1359163005: Remove surface_id from RenderWidget/RenderWidgetHost and friends (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@channel_creation_preempt
Patch Set: fix more tests Created 5 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 (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 CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 bool last_unlocked_by_target) override; 484 bool last_unlocked_by_target) override;
485 void LostMouseLock() override; 485 void LostMouseLock() override;
486 void CreateNewWindow( 486 void CreateNewWindow(
487 SiteInstance* source_site_instance, 487 SiteInstance* source_site_instance,
488 int route_id, 488 int route_id,
489 int main_frame_route_id, 489 int main_frame_route_id,
490 const ViewHostMsg_CreateWindow_Params& params, 490 const ViewHostMsg_CreateWindow_Params& params,
491 SessionStorageNamespace* session_storage_namespace) override; 491 SessionStorageNamespace* session_storage_namespace) override;
492 void CreateNewWidget(int32 render_process_id, 492 void CreateNewWidget(int32 render_process_id,
493 int32 route_id, 493 int32 route_id,
494 int32 surface_id,
495 blink::WebPopupType popup_type) override; 494 blink::WebPopupType popup_type) override;
496 void CreateNewFullscreenWidget(int32 render_process_id, 495 void CreateNewFullscreenWidget(int32 render_process_id,
497 int32 route_id, 496 int32 route_id) override;
498 int32 surface_id) override;
499 void ShowCreatedWindow(int route_id, 497 void ShowCreatedWindow(int route_id,
500 WindowOpenDisposition disposition, 498 WindowOpenDisposition disposition,
501 const gfx::Rect& initial_rect, 499 const gfx::Rect& initial_rect,
502 bool user_gesture) override; 500 bool user_gesture) override;
503 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override; 501 void ShowCreatedWidget(int route_id, const gfx::Rect& initial_rect) override;
504 void ShowCreatedFullscreenWidget(int route_id) override; 502 void ShowCreatedFullscreenWidget(int route_id) override;
505 void RequestMediaAccessPermission( 503 void RequestMediaAccessPermission(
506 const MediaStreamRequest& request, 504 const MediaStreamRequest& request,
507 const MediaResponseCallback& callback) override; 505 const MediaResponseCallback& callback) override;
508 bool CheckMediaAccessPermission(const GURL& security_origin, 506 bool CheckMediaAccessPermission(const GURL& security_origin,
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 // 921 //
924 // This is used as the backend for state updates, which include a new title, 922 // This is used as the backend for state updates, which include a new title,
925 // or the dedicated set title message. It returns true if the new title is 923 // or the dedicated set title message. It returns true if the new title is
926 // different and was therefore updated. 924 // different and was therefore updated.
927 bool UpdateTitleForEntry(NavigationEntryImpl* entry, 925 bool UpdateTitleForEntry(NavigationEntryImpl* entry,
928 const base::string16& title); 926 const base::string16& title);
929 927
930 // Helper for CreateNewWidget/CreateNewFullscreenWidget. 928 // Helper for CreateNewWidget/CreateNewFullscreenWidget.
931 void CreateNewWidget(int32 render_process_id, 929 void CreateNewWidget(int32 render_process_id,
932 int32 route_id, 930 int32 route_id,
933 int32 surface_id,
934 bool is_fullscreen, 931 bool is_fullscreen,
935 blink::WebPopupType popup_type); 932 blink::WebPopupType popup_type);
936 933
937 // Helper for ShowCreatedWidget/ShowCreatedFullscreenWidget. 934 // Helper for ShowCreatedWidget/ShowCreatedFullscreenWidget.
938 void ShowCreatedWidget(int route_id, 935 void ShowCreatedWidget(int route_id,
939 bool is_fullscreen, 936 bool is_fullscreen,
940 const gfx::Rect& initial_rect); 937 const gfx::Rect& initial_rect);
941 938
942 // Finds the new RenderWidgetHost and returns it. Note that this can only be 939 // Finds the new RenderWidgetHost and returns it. Note that this can only be
943 // called once as this call also removes it from the internal map. 940 // called once as this call also removes it from the internal map.
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1330 // Adds/removes a callback called on creation of each new WebContents. 1327 // Adds/removes a callback called on creation of each new WebContents.
1331 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1328 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1332 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1329 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1333 1330
1334 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1331 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1335 }; 1332 };
1336 1333
1337 } // namespace content 1334 } // namespace content
1338 1335
1339 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1336 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/security_exploit_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698