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

Unified Diff: chrome/browser/navigation_controller.cc

Issue 5005: Reorganize the declarations to have some grouping and logical ordering in tab... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/native_ui_contents.cc ('k') | chrome/browser/render_view_host_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/navigation_controller.cc
===================================================================
--- chrome/browser/navigation_controller.cc (revision 2626)
+++ chrome/browser/navigation_controller.cc (working copy)
@@ -907,13 +907,13 @@
NavigationEntry* last_entry = GetLastCommittedEntry();
if (last_entry && last_entry->tab_type() != active_contents_->type()) {
TabContents* from_contents = active_contents_;
- from_contents->SetActive(false);
+ from_contents->set_is_active(false);
// Switch back to the previous tab contents.
active_contents_ = GetTabContents(last_entry->tab_type());
DCHECK(active_contents_);
- active_contents_->SetActive(true);
+ active_contents_->set_is_active(true);
// If we are transitioning from two types of WebContents, we need to migrate
// the download shelf if it is visible. The download shelf may have been
@@ -992,14 +992,14 @@
pending_entry_->ssl() = NavigationEntry::SSLStatus();
if (from_contents && from_contents->type() != pending_entry_->tab_type())
- from_contents->SetActive(false);
+ from_contents->set_is_active(false);
HWND parent =
from_contents ? GetParent(from_contents->GetContainerHWND()) : 0;
TabContents* contents =
GetTabContentsCreateIfNecessary(parent, *pending_entry_);
- contents->SetActive(true);
+ contents->set_is_active(true);
active_contents_ = contents;
if (from_contents && from_contents != contents) {
« no previous file with comments | « chrome/browser/native_ui_contents.cc ('k') | chrome/browser/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698