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

Side by Side Diff: content/browser/tab_contents/tab_contents_delegate.cc

Issue 8224023: Don't show URL for pending new navigations initiated by the renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 9 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/tab_contents_delegate.h" 5 #include "content/browser/tab_contents/tab_contents_delegate.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "content/browser/javascript_dialogs.h" 10 #include "content/browser/javascript_dialogs.h"
11 #include "content/browser/tab_contents/tab_contents.h" 11 #include "content/browser/tab_contents/tab_contents.h"
12 #include "content/common/url_constants.h" 12 #include "content/common/url_constants.h"
13 #include "ui/gfx/rect.h" 13 #include "ui/gfx/rect.h"
14 #include "webkit/glue/web_intent_data.h" 14 #include "webkit/glue/web_intent_data.h"
15 15
16 TabContentsDelegate::TabContentsDelegate() { 16 TabContentsDelegate::TabContentsDelegate() {
17 } 17 }
18 18
19 TabContents* TabContentsDelegate::OpenURLFromTab( 19 TabContents* TabContentsDelegate::OpenURLFromTab(
20 TabContents* source, 20 TabContents* source,
21 const GURL& url, 21 const GURL& url,
22 const GURL& referrer, 22 const GURL& referrer,
23 WindowOpenDisposition disposition, 23 WindowOpenDisposition disposition,
24 content::PageTransition transition) { 24 content::PageTransition transition) {
25 return OpenURLFromTab(source, 25 return OpenURLFromTab(source,
26 OpenURLParams(url, referrer, disposition, transition)); 26 OpenURLParams(url, referrer, disposition, transition,
27 false));
27 } 28 }
28 29
29 TabContents* TabContentsDelegate::OpenURLFromTab(TabContents* source, 30 TabContents* TabContentsDelegate::OpenURLFromTab(TabContents* source,
30 const OpenURLParams& params) { 31 const OpenURLParams& params) {
31 return NULL; 32 return NULL;
32 } 33 }
33 34
34 void TabContentsDelegate::NavigationStateChanged(const TabContents* source, 35 void TabContentsDelegate::NavigationStateChanged(const TabContents* source,
35 unsigned changed_flags) { 36 unsigned changed_flags) {
36 } 37 }
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 337
337 void TabContentsDelegate::Attach(TabContents* tab_contents) { 338 void TabContentsDelegate::Attach(TabContents* tab_contents) {
338 DCHECK(attached_contents_.find(tab_contents) == attached_contents_.end()); 339 DCHECK(attached_contents_.find(tab_contents) == attached_contents_.end());
339 attached_contents_.insert(tab_contents); 340 attached_contents_.insert(tab_contents);
340 } 341 }
341 342
342 void TabContentsDelegate::Detach(TabContents* tab_contents) { 343 void TabContentsDelegate::Detach(TabContents* tab_contents) {
343 DCHECK(attached_contents_.find(tab_contents) != attached_contents_.end()); 344 DCHECK(attached_contents_.find(tab_contents) != attached_contents_.end());
344 attached_contents_.erase(tab_contents); 345 attached_contents_.erase(tab_contents);
345 } 346 }
OLDNEW
« no previous file with comments | « content/browser/tab_contents/tab_contents.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698