Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4037)

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.cc

Issue 308003003: Allow requesting Automation tree by tabId (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unnecessary content script from tests Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
+ }
not at google - send to devlin 2014/05/29 22:41:37 ok :)
return false;
}
@@ -283,6 +285,7 @@ bool WindowsCreateFunction::ShouldOpenIncognitoWindow(
incognito = true;
}
+
not at google - send to devlin 2014/05/29 22:41:37 no blank line
aboxhall 2014/05/30 15:37:11 Done.
// 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()) {

Powered by Google App Engine
This is Rietveld 408576698