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

Side by Side Diff: Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

Issue 6541090: Merge 79107 - 2011-02-19 Charlie Reis <creis@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h ('k') | Source/WebKit/gtk/ChangeLog » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Zack Rusin <zack@kde.org> 2 * Copyright (C) 2006 Zack Rusin <zack@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 3 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
5 * Copyright (C) 2008 Collabora Ltd. All rights reserved. 5 * Copyright (C) 2008 Collabora Ltd. All rights reserved.
6 * Copyright (C) 2008 Holger Hans Peter Freyther 6 * Copyright (C) 2008 Holger Hans Peter Freyther
7 * Copyright (C) 2008 Kenneth Rohde Christiansen 7 * Copyright (C) 2008 Kenneth Rohde Christiansen
8 * Copyright (C) 2009-2010 ProFUSION embedded systems 8 * Copyright (C) 2009-2010 ProFUSION embedded systems
9 * Copyright (C) 2009-2010 Samsung Electronics 9 * Copyright (C) 2009-2010 Samsung Electronics
10 * 10 *
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 } 503 }
504 504
505 bool FrameLoaderClientEfl::shouldGoToHistoryItem(HistoryItem* item) const 505 bool FrameLoaderClientEfl::shouldGoToHistoryItem(HistoryItem* item) const
506 { 506 {
507 // FIXME: This is a very simple implementation. More sophisticated 507 // FIXME: This is a very simple implementation. More sophisticated
508 // implementation would delegate the decision to a PolicyDelegate. 508 // implementation would delegate the decision to a PolicyDelegate.
509 // See mac implementation for example. 509 // See mac implementation for example.
510 return item; 510 return item;
511 } 511 }
512 512
513 bool FrameLoaderClientEfl::shouldStopLoadingForHistoryItem(HistoryItem* item) co nst
514 {
515 return true;
516 }
517
513 void FrameLoaderClientEfl::didDisplayInsecureContent() 518 void FrameLoaderClientEfl::didDisplayInsecureContent()
514 { 519 {
515 notImplemented(); 520 notImplemented();
516 } 521 }
517 522
518 void FrameLoaderClientEfl::didRunInsecureContent(SecurityOrigin*) 523 void FrameLoaderClientEfl::didRunInsecureContent(SecurityOrigin*)
519 { 524 {
520 notImplemented(); 525 notImplemented();
521 } 526 }
522 527
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 void FrameLoaderClientEfl::dispatchDidBecomeFrameset(bool) 939 void FrameLoaderClientEfl::dispatchDidBecomeFrameset(bool)
935 { 940 {
936 } 941 }
937 942
938 PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext () 943 PassRefPtr<FrameNetworkingContext> FrameLoaderClientEfl::createNetworkingContext ()
939 { 944 {
940 return FrameNetworkingContextEfl::create(ewk_frame_core_get(m_frame)); 945 return FrameNetworkingContextEfl::create(ewk_frame_core_get(m_frame));
941 } 946 }
942 947
943 } 948 }
OLDNEW
« no previous file with comments | « Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h ('k') | Source/WebKit/gtk/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698