diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 17:03:08 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 17:03:08 +0000 |
commit | 98aa0b5c0dd2f6721d7c1bb81fe87812fe5573ee (patch) | |
tree | 77dd37111cdb925321816cc66da4110d43a03880 /chrome/browser/tabs/tab_strip_model.cc | |
parent | 54903eaa08bde272797e0f2a6befa213dd93b9b6 (diff) | |
download | chromium_src-98aa0b5c0dd2f6721d7c1bb81fe87812fe5573ee.zip chromium_src-98aa0b5c0dd2f6721d7c1bb81fe87812fe5573ee.tar.gz chromium_src-98aa0b5c0dd2f6721d7c1bb81fe87812fe5573ee.tar.bz2 |
Rename all occurrences of "app extension" with "extension app" since we were using both and consistency is nice.
Review URL: http://codereview.chromium.org/1924002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46576 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model.cc')
-rw-r--r-- | chrome/browser/tabs/tab_strip_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index f08e9c5..be154f6 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -765,7 +765,7 @@ void TabStripModel::Observe(NotificationType type, // Iterate backwards as we may remove items while iterating. for (int i = count() - 1; i >= 0; i--) { TabContents* contents = GetTabContentsAt(i); - if (contents->app_extension() == extension) { + if (contents->extension_app() == extension) { // The extension an app tab was created from has been nuked. Delete // the TabContents. Deleting a TabContents results in a notification // of type TAB_CONTENTS_DESTROYED; we do the necessary cleanup in @@ -937,11 +937,11 @@ bool TabStripModel::ShouldMakePhantomOnClose(int index) { if (!extension_service) return false; - Extension* app_extension = GetTabContentsAt(index)->app_extension(); - DCHECK(app_extension); + Extension* extension_app = GetTabContentsAt(index)->extension_app(); + DCHECK(extension_app); // Only allow the tab to be made phantom if the extension still exists. - return extension_service->GetExtensionById(app_extension->id(), + return extension_service->GetExtensionById(extension_app->id(), false) != NULL; } return false; |