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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 176883012: Set the original url correctly if the frame is loaded via loadData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add // static comment Created 6 years, 9 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_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 unsigned action); 364 unsigned action);
365 365
366 // Returns whether |params.selection_text| should be synchronized to the 366 // Returns whether |params.selection_text| should be synchronized to the
367 // browser before bringing up the context menu. Static for testing. 367 // browser before bringing up the context menu. Static for testing.
368 static bool ShouldUpdateSelectionTextFromContextMenuParams( 368 static bool ShouldUpdateSelectionTextFromContextMenuParams(
369 const base::string16& selection_text, 369 const base::string16& selection_text,
370 size_t selection_text_offset, 370 size_t selection_text_offset,
371 const gfx::Range& selection_range, 371 const gfx::Range& selection_range,
372 const ContextMenuParams& params); 372 const ContextMenuParams& params);
373 373
374 // Returns the original request url. If there is no redirect, the original
375 // url is the same as ds->request()->url(). If the WebDataSource belongs to a
376 // frame was loaded by loadData, the original url will be ds->unreachableURL()
377 static GURL GetOriginalRequestURL(blink::WebDataSource* ds);
378
374 // Stores the WebFrame we are associated with. 379 // Stores the WebFrame we are associated with.
375 blink::WebFrame* frame_; 380 blink::WebFrame* frame_;
376 381
377 base::WeakPtr<RenderViewImpl> render_view_; 382 base::WeakPtr<RenderViewImpl> render_view_;
378 int routing_id_; 383 int routing_id_;
379 bool is_swapped_out_; 384 bool is_swapped_out_;
380 bool is_detaching_; 385 bool is_detaching_;
381 386
382 #if defined(ENABLE_PLUGINS) 387 #if defined(ENABLE_PLUGINS)
383 // Current text input composition text. Empty if no composition is in 388 // Current text input composition text. Empty if no composition is in
(...skipping 20 matching lines...) Expand all
404 // always respond properly to the request, so we don't have to worry so 409 // always respond properly to the request, so we don't have to worry so
405 // much about leaks. 410 // much about leaks.
406 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_; 411 IDMap<ContextMenuClient, IDMapExternalPointer> pending_context_menus_;
407 412
408 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 413 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
409 }; 414 };
410 415
411 } // namespace content 416 } // namespace content
412 417
413 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 418 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698