diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-24 07:07:34 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-24 07:07:34 +0000 |
commit | 616dab5a62842c3d98b65620ad986fd485e54eec (patch) | |
tree | 9b831f5f45d01502d6f828f54562b7b970501e65 /chrome/browser/tabs/tab_strip_model.h | |
parent | 9d80e0794fecdda750b11cf268f811881f0ed0ec (diff) | |
download | chromium_src-616dab5a62842c3d98b65620ad986fd485e54eec.zip chromium_src-616dab5a62842c3d98b65620ad986fd485e54eec.tar.gz chromium_src-616dab5a62842c3d98b65620ad986fd485e54eec.tar.bz2 |
Make sure the TabStripModelDelegate can never be NULL.
TBR=brettw
Review URL: http://codereview.chromium.org/18578
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model.h')
-rw-r--r-- | chrome/browser/tabs/tab_strip_model.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h index a9a6578..a6bf00f 100644 --- a/chrome/browser/tabs/tab_strip_model.h +++ b/chrome/browser/tabs/tab_strip_model.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H__ -#define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H__ +#ifndef CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_ +#define CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_ #include <vector> @@ -167,7 +167,7 @@ class TabStripModelDelegate { class TabStripModel : public NotificationObserver { public: // Construct a TabStripModel with a delegate to help it do certain things - // (See TabStripModelDelegate documentation). + // (See TabStripModelDelegate documentation). |delegate| cannot be NULL. TabStripModel(TabStripModelDelegate* delegate, Profile* profile); virtual ~TabStripModel(); @@ -518,7 +518,7 @@ class TabStripModel : public NotificationObserver { typedef ObserverList<TabStripModelObserver> TabStripModelObservers; TabStripModelObservers observers_; - DISALLOW_EVIL_CONSTRUCTORS(TabStripModel); + DISALLOW_COPY_AND_ASSIGN(TabStripModel); }; -#endif // CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H__ +#endif // CHROME_BROWSER_TABS_TAB_STRIP_MODEL_H_ |