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

Side by Side Diff: content/browser/frame_host/navigator_impl.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 #include "content/browser/frame_host/navigator_impl.h" 5 #include "content/browser/frame_host/navigator_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/frame_tree_node.h" 9 #include "content/browser/frame_host/frame_tree_node.h"
10 #include "content/browser/frame_host/navigation_controller_impl.h" 10 #include "content/browser/frame_host/navigation_controller_impl.h"
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 361
362 // Make sure no code called via RFH::Navigate clears the pending entry. 362 // Make sure no code called via RFH::Navigate clears the pending entry.
363 CHECK_EQ(controller_->GetPendingEntry(), &entry); 363 CHECK_EQ(controller_->GetPendingEntry(), &entry);
364 364
365 if (entry.GetPageID() == -1) { 365 if (entry.GetPageID() == -1) {
366 // HACK!! This code suppresses javascript: URLs from being added to 366 // HACK!! This code suppresses javascript: URLs from being added to
367 // session history, which is what we want to do for javascript: URLs that 367 // session history, which is what we want to do for javascript: URLs that
368 // do not generate content. What we really need is a message from the 368 // do not generate content. What we really need is a message from the
369 // renderer telling us that a new page was not created. The same message 369 // renderer telling us that a new page was not created. The same message
370 // could be used for mailto: URLs and the like. 370 // could be used for mailto: URLs and the like.
371 if (entry.GetURL().SchemeIs(kJavaScriptScheme)) 371 if (entry.GetURL().SchemeIs(url::kJavaScriptScheme))
372 return false; 372 return false;
373 } 373 }
374 374
375 // Notify observers about navigation. 375 // Notify observers about navigation.
376 if (delegate_) { 376 if (delegate_) {
377 delegate_->DidStartNavigationToPendingEntry(render_frame_host, 377 delegate_->DidStartNavigationToPendingEntry(render_frame_host,
378 entry.GetURL(), 378 entry.GetURL(),
379 reload_type); 379 reload_type);
380 } 380 }
381 381
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 614
615 // Navigations in Web UI pages count as browser-initiated navigations. 615 // Navigations in Web UI pages count as browser-initiated navigations.
616 params.is_renderer_initiated = false; 616 params.is_renderer_initiated = false;
617 } 617 }
618 618
619 if (delegate_) 619 if (delegate_)
620 delegate_->RequestOpenURL(render_frame_host, params); 620 delegate_->RequestOpenURL(render_frame_host, params);
621 } 621 }
622 622
623 } // namespace content 623 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698