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

Side by Side Diff: chrome/browser/ui/browser_navigator.h

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 | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | 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 #ifndef CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
6 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 6 #define CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // removed from |tabstrip_add_types| automatically. 87 // removed from |tabstrip_add_types| automatically.
88 // If disposition is one of NEW_WINDOW, NEW_POPUP, NEW_FOREGROUND_TAB or 88 // If disposition is one of NEW_WINDOW, NEW_POPUP, NEW_FOREGROUND_TAB or
89 // SINGLETON_TAB, then TabStripModel::ADD_ACTIVE is automatically added to 89 // SINGLETON_TAB, then TabStripModel::ADD_ACTIVE is automatically added to
90 // |tabstrip_add_types|. 90 // |tabstrip_add_types|.
91 WindowOpenDisposition disposition; 91 WindowOpenDisposition disposition;
92 92
93 // The transition type of the navigation. Default is PageTransition::LINK 93 // The transition type of the navigation. Default is PageTransition::LINK
94 // when target_contents is specified in the constructor. 94 // when target_contents is specified in the constructor.
95 content::PageTransition transition; 95 content::PageTransition transition;
96 96
97 // Whether this navigation was initiated by the renderer process.
98 bool is_renderer_initiated;
99
97 // The index the caller would like the tab to be positioned at in the 100 // The index the caller would like the tab to be positioned at in the
98 // TabStrip. The actual index will be determined by the TabHandler in 101 // TabStrip. The actual index will be determined by the TabHandler in
99 // accordance with |add_types|. Defaults to -1 (allows the TabHandler to 102 // accordance with |add_types|. Defaults to -1 (allows the TabHandler to
100 // decide). 103 // decide).
101 int tabstrip_index; 104 int tabstrip_index;
102 105
103 // A bitmask of values defined in TabStripModel::AddTabTypes. Helps 106 // A bitmask of values defined in TabStripModel::AddTabTypes. Helps
104 // determine where to insert a new tab and whether or not it should be 107 // determine where to insert a new tab and whether or not it should be
105 // selected, among other properties. Default is ADD_ACTIVE. 108 // selected, among other properties. Default is ADD_ACTIVE.
106 int tabstrip_add_types; 109 int tabstrip_add_types;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 // Navigates according to the configuration specified in |params|. 187 // Navigates according to the configuration specified in |params|.
185 void Navigate(NavigateParams* params); 188 void Navigate(NavigateParams* params);
186 189
187 // If the given navigational URL is a Singleton, return the tab index for it. 190 // If the given navigational URL is a Singleton, return the tab index for it.
188 // Otherwise, returns -1. 191 // Otherwise, returns -1.
189 int GetIndexOfSingletonTab(NavigateParams* params); 192 int GetIndexOfSingletonTab(NavigateParams* params);
190 193
191 } // namespace browser 194 } // namespace browser
192 195
193 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_ 196 #endif // CHROME_BROWSER_UI_BROWSER_NAVIGATOR_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/browser_navigator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698