diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 20:27:39 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 20:27:39 +0000 |
| commit | 8b64e20472a0d23ca24b12c32e8b962e1b429b47 (patch) | |
| tree | cf22a75f91123fad9e7d12567eec43c33127a7e4 /chrome/browser/ui | |
| parent | 954b10803a3d37f4a079874d5a6c81d4956920c6 (diff) | |
| download | chromium_src-8b64e20472a0d23ca24b12c32e8b962e1b429b47.zip chromium_src-8b64e20472a0d23ca24b12c32e8b962e1b429b47.tar.gz chromium_src-8b64e20472a0d23ca24b12c32e8b962e1b429b47.tar.bz2 | |
Rename WindowsSessionEnding to SessionEnding since it's used on multiple platforms.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4681004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/browser_list.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/browser_list.h | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/browser_frame_win.cc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index 2652c1a..7e93e12 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc @@ -294,7 +294,7 @@ void BrowserList::CloseAllBrowsersAndExit() { } // static -void BrowserList::WindowsSessionEnding() { +void BrowserList::SessionEnding() { // EndSession is invoked once per frame. Only do something the first time. static bool already_ended = false; if (already_ended) @@ -357,7 +357,7 @@ void BrowserList::StartKeepAlive() { // static void BrowserList::EndKeepAlive() { - DCHECK(keep_alive_count_ > 0); + DCHECK_GT(keep_alive_count_, 0); keep_alive_count_--; // Allow the app to shutdown again. if (!WillKeepAlive()) { diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h index bef9013..07ee0ec 100644 --- a/chrome/browser/ui/browser_list.h +++ b/chrome/browser/ui/browser_list.h @@ -107,8 +107,8 @@ class BrowserList { // message. static void CloseAllBrowsers(); - // Begins shutdown of the application when the Windows session is ending. - static void WindowsSessionEnding(); + // Begins shutdown of the application when the session is ending. + static void SessionEnding(); // Returns true if there is at least one Browser with the specified profile. static bool HasBrowserWithProfile(Profile* profile); @@ -204,11 +204,11 @@ class TabContentsIterator { } // Incrementing operators, valid as long as !Done() - TabContents* operator++() { // ++preincrement + TabContents* operator++() { // ++preincrement Advance(); return cur_; } - TabContents* operator++(int) { // postincrement++ + TabContents* operator++(int) { // postincrement++ TabContents* tmp = cur_; Advance(); return tmp; diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index bd5ddca..6ddff88 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -167,7 +167,7 @@ bool BrowserFrameWin::GetAccelerator(int cmd_id, } void BrowserFrameWin::OnEndSession(BOOL ending, UINT logoff) { - BrowserList::WindowsSessionEnding(); + BrowserList::SessionEnding(); } void BrowserFrameWin::OnEnterSizeMove() { |