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: chrome/browser/tab_contents/tab_contents.h

Issue 594063: Plumb shift-reload down into newly-added shift-reload API. (Closed)
Patch Set: 80 Created 10 years, 10 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_TAB_CONTENTS_TAB_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 6 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #include <deque> 10 #include <deque>
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 // the current pending entry. The NavigationController should be called back 314 // the current pending entry. The NavigationController should be called back
315 // with CommitPendingEntry/RendererDidNavigate on success or 315 // with CommitPendingEntry/RendererDidNavigate on success or
316 // DiscardPendingEntry. The callbacks can be inside of this function, or at 316 // DiscardPendingEntry. The callbacks can be inside of this function, or at
317 // some future time. 317 // some future time.
318 // 318 //
319 // The entry has a PageID of -1 if newly created (corresponding to navigation 319 // The entry has a PageID of -1 if newly created (corresponding to navigation
320 // to a new URL). 320 // to a new URL).
321 // 321 //
322 // If this method returns false, then the navigation is discarded (equivalent 322 // If this method returns false, then the navigation is discarded (equivalent
323 // to calling DiscardPendingEntry on the NavigationController). 323 // to calling DiscardPendingEntry on the NavigationController).
324 virtual bool NavigateToPendingEntry(bool reload); 324 virtual bool NavigateToPendingEntry(
325 NavigationController::ReloadType reload_type);
325 326
326 // Stop any pending navigation. 327 // Stop any pending navigation.
327 virtual void Stop(); 328 virtual void Stop();
328 329
329 // TODO(erg): HACK ALERT! This was thrown together for beta and 330 // TODO(erg): HACK ALERT! This was thrown together for beta and
330 // needs to be completely removed after we ship it. Right now, the 331 // needs to be completely removed after we ship it. Right now, the
331 // cut/copy/paste menu items are always enabled and will send a 332 // cut/copy/paste menu items are always enabled and will send a
332 // cut/copy/paste command to the currently visible 333 // cut/copy/paste command to the currently visible
333 // TabContents. Post-beta, this needs to be replaced with a unified 334 // TabContents. Post-beta, this needs to be replaced with a unified
334 // interface for supporting cut/copy/paste, and managing who has 335 // interface for supporting cut/copy/paste, and managing who has
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
1187 1188
1188 // Information about the language the page is in and has been translated to. 1189 // Information about the language the page is in and has been translated to.
1189 LanguageState language_state_; 1190 LanguageState language_state_;
1190 1191
1191 // --------------------------------------------------------------------------- 1192 // ---------------------------------------------------------------------------
1192 1193
1193 DISALLOW_COPY_AND_ASSIGN(TabContents); 1194 DISALLOW_COPY_AND_ASSIGN(TabContents);
1194 }; 1195 };
1195 1196
1196 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_ 1197 #endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698