summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tab_util.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 22:09:23 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-28 22:09:23 +0000
commiteba8f7dad880707026ff1849fa9ede6e614854bb (patch)
tree54bb8050ec0b5dcea5c3224fd3c3b85a776ee74c /chrome/browser/extensions/extension_tab_util.cc
parent073cc281af990556c5f80a863ed09bacbe8f916e (diff)
downloadchromium_src-eba8f7dad880707026ff1849fa9ede6e614854bb.zip
chromium_src-eba8f7dad880707026ff1849fa9ede6e614854bb.tar.gz
chromium_src-eba8f7dad880707026ff1849fa9ede6e614854bb.tar.bz2
Cleanup: Rename ExtensionFunction::GetExtension to ExtensionFunction::extension.
It's a trivial accessor, and the setter is set_extension. R=rockot@chromium.org TBR=dmazzoni@chromium.org, pkasting@chromium.org Review URL: https://codereview.chromium.org/410413010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tab_util.cc')
-rw-r--r--chrome/browser/extensions/extension_tab_util.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index cfbbdc1..350ea95 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -170,8 +170,8 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(
GURL url;
if (params.url.get()) {
std::string url_string= *params.url;
- url = ExtensionTabUtil::ResolvePossiblyRelativeURL(
- url_string, function->GetExtension());
+ url = ExtensionTabUtil::ResolvePossiblyRelativeURL(url_string,
+ function->extension());
if (!url.is_valid()) {
*error =
ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError, url_string);
@@ -202,7 +202,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(
// We can't load extension URLs into incognito windows unless the extension
// uses split mode. Special case to fall back to a tabbed window.
if (url.SchemeIs(kExtensionScheme) &&
- !IncognitoInfo::IsSplitMode(function->GetExtension()) &&
+ !IncognitoInfo::IsSplitMode(function->extension()) &&
browser->profile()->IsOffTheRecord()) {
Profile* profile = browser->profile()->GetOriginalProfile();
chrome::HostDesktopType desktop_type = browser->host_desktop_type();
@@ -252,7 +252,7 @@ base::DictionaryValue* ExtensionTabUtil::OpenTab(
return ExtensionTabUtil::CreateTabValue(navigate_params.target_contents,
tab_strip,
new_index,
- function->GetExtension());
+ function->extension());
}
Browser* ExtensionTabUtil::GetBrowserFromWindowID(