| Index: chrome/browser/extensions/api/tabs/tabs_api.cc
|
| diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| index 8821fca3861a3b10e33f82bb9b6d181e70cdf774..6b015e4ab5d45513e972bdb149a38a7818bad74a 100644
|
| --- a/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
|
| @@ -132,12 +132,14 @@ bool GetTabById(int tab_id,
|
| int* tab_index,
|
| std::string* error_message) {
|
| if (ExtensionTabUtil::GetTabById(tab_id, profile, include_incognito,
|
| - browser, tab_strip, contents, tab_index))
|
| + browser, tab_strip, contents, tab_index)) {
|
| return true;
|
| + }
|
|
|
| - if (error_message)
|
| + if (error_message) {
|
| *error_message = ErrorUtils::FormatErrorMessage(
|
| keys::kTabNotFoundError, base::IntToString(tab_id));
|
| + }
|
|
|
| return false;
|
| }
|
| @@ -283,6 +285,7 @@ bool WindowsCreateFunction::ShouldOpenIncognitoWindow(
|
| incognito = true;
|
| }
|
|
|
| +
|
| // Remove all URLs that are not allowed in an incognito session. Note that a
|
| // ChromeOS guest session is not considered incognito in this case.
|
| if (incognito && !GetProfile()->IsGuestSession()) {
|
|
|