diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-15 01:10:54 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-15 01:10:54 +0000 |
| commit | c7c42339edf2a4ee2e77736d90c916125365341c (patch) | |
| tree | 12177ee2d2c64b07ef70f9b6c3c6531bbb42010b /chrome/browser/browser.h | |
| parent | 28da4ae08d6b578a56ad964fcb40c67a511a84af (diff) | |
| download | chromium_src-c7c42339edf2a4ee2e77736d90c916125365341c.zip chromium_src-c7c42339edf2a4ee2e77736d90c916125365341c.tar.gz chromium_src-c7c42339edf2a4ee2e77736d90c916125365341c.tar.bz2 | |
Remove a bunch of NULL checks that seem unnecessary, and document some checks that are.
Review URL: http://codereview.chromium.org/10962
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 1f21962..398f5ae 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -10,6 +10,7 @@ #include "chrome/browser/browser_type.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/session_id.h" +#include "chrome/browser/tab_contents.h" #include "chrome/browser/tab_contents_delegate.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/toolbar_model.h" @@ -142,7 +143,6 @@ class Browser : public TabStripModelDelegate, TabContents* GetSelectedTabContents() const { return tabstrip_model_.GetSelectedTabContents(); } - NavigationController* GetSelectedNavigationController() const; void SelectTabContentsAt(int index, bool user_gesture) { tabstrip_model_.SelectTabContentsAt(index, user_gesture); } @@ -526,7 +526,11 @@ class Browser : public TabStripModelDelegate, // ToolbarModel implementation. virtual NavigationController* GetNavigationController() { - return browser_->GetSelectedNavigationController(); + // This |current_tab| can be NULL during the initialization of the + // toolbar during window creation (i.e. before any tabs have been added + // to the window). + TabContents* current_tab = browser_->GetSelectedTabContents(); + return current_tab ? current_tab->controller() : NULL; } private: |