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

Side by Side Diff: content/renderer/history_controller.cc

Issue 547093002: Return WebLocalFrame from RenderFrame::GetWebFrame(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 19 matching lines...) Expand all
30 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 30 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
31 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 31 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35 35
36 #include "content/renderer/history_controller.h" 36 #include "content/renderer/history_controller.h"
37 37
38 #include "content/renderer/render_frame_impl.h" 38 #include "content/renderer/render_frame_impl.h"
39 #include "content/renderer/render_view_impl.h" 39 #include "content/renderer/render_view_impl.h"
40 #include "third_party/WebKit/public/web/WebFrame.h" 40 #include "third_party/WebKit/public/web/WebLocalFrame.h"
41 41
42 using blink::WebFrame; 42 using blink::WebFrame;
43 using blink::WebHistoryCommitType; 43 using blink::WebHistoryCommitType;
44 using blink::WebHistoryItem; 44 using blink::WebHistoryItem;
45 using blink::WebURLRequest; 45 using blink::WebURLRequest;
46 46
47 namespace content { 47 namespace content {
48 48
49 HistoryController::HistoryController(RenderViewImpl* render_view) 49 HistoryController::HistoryController(RenderViewImpl* render_view)
50 : render_view_(render_view) { 50 : render_view_(render_view) {
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 if (!current_entry_) { 186 if (!current_entry_) {
187 current_entry_.reset( 187 current_entry_.reset(
188 new HistoryEntry(new_item, target_frame->GetRoutingID())); 188 new HistoryEntry(new_item, target_frame->GetRoutingID()));
189 } else { 189 } else {
190 current_entry_.reset(current_entry_->CloneAndReplace( 190 current_entry_.reset(current_entry_->CloneAndReplace(
191 new_item, clone_children_of_target, target_frame, render_view_)); 191 new_item, clone_children_of_target, target_frame, render_view_));
192 } 192 }
193 } 193 }
194 194
195 } // namespace content 195 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698