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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_tabs_module.cc

Issue 8969011: Added populate parameter to chrome.windows.get, chrome.windows.getCurrent, (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years 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
« no previous file with comments | « chrome/browser/extensions/extension_function_test_utils.cc ('k') | chrome/browser/extensions/extension_tabs_test.cc » ('j') | chrome/browser/extensions/extension_tabs_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_tabs_module.cc
===================================================================
--- chrome/browser/extensions/extension_tabs_module.cc (revision 114952)
+++ chrome/browser/extensions/extension_tabs_module.cc (working copy)
@@ -138,7 +138,7 @@
bool ReadOneOrMoreIntegers(
Value* value, std::vector<int>* result) {
if (value->IsType(Value::TYPE_INTEGER)) {
- int tab_id;
+ int tab_id = -1;
if (!value->GetAsInteger(&tab_id))
return false;
result->push_back(tab_id);
@@ -147,7 +147,7 @@
} else if (value->IsType(Value::TYPE_LIST)) {
ListValue* tabs = static_cast<ListValue*>(value);
for (size_t i = 0; i < tabs->GetSize(); ++i) {
- int tab_id;
+ int tab_id = -1;
if (!tabs->GetInteger(i, &tab_id))
return false;
result->push_back(tab_id);
@@ -186,9 +186,20 @@
// Windows ---------------------------------------------------------------------
bool GetWindowFunction::RunImpl() {
- int window_id;
+ int window_id = -1;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
+ bool populate_tabs = false;
+ if (HasOptionalArgument(1)) {
+ DictionaryValue* args = NULL;
+ EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &args));
+
+ if (args->HasKey(keys::kPopulateKey)) {
+ EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kPopulateKey,
+ &populate_tabs));
+ }
+ }
+
Browser* browser = GetBrowserInProfileWithId(profile(), window_id,
include_incognito(), &error_);
if (!browser || !browser->window()) {
@@ -197,35 +208,57 @@
return false;
}
- result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false));
+ result_.reset(ExtensionTabUtil::CreateWindowValue(browser, populate_tabs));
return true;
}
bool GetCurrentWindowFunction::RunImpl() {
+ bool populate_tabs = false;
+ if (HasOptionalArgument(0)) {
+ DictionaryValue* args = NULL;
+ EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args));
+
+ if (args->HasKey(keys::kPopulateKey)) {
+ EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kPopulateKey,
+ &populate_tabs));
+ }
+ }
+
Browser* browser = GetCurrentBrowser();
if (!browser || !browser->window()) {
error_ = keys::kNoCurrentWindowError;
return false;
}
- result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false));
+ result_.reset(ExtensionTabUtil::CreateWindowValue(browser, populate_tabs));
return true;
}
bool GetLastFocusedWindowFunction::RunImpl() {
+ bool populate_tabs = false;
+ if (HasOptionalArgument(0)) {
+ DictionaryValue* args = NULL;
+ EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args));
+
+ if (args->HasKey(keys::kPopulateKey)) {
+ EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kPopulateKey,
+ &populate_tabs));
+ }
+ }
+
Browser* browser = BrowserList::FindAnyBrowser(
profile(), include_incognito());
if (!browser || !browser->window()) {
error_ = keys::kNoLastFocusedWindowError;
return false;
}
- result_.reset(ExtensionTabUtil::CreateWindowValue(browser, false));
+ result_.reset(ExtensionTabUtil::CreateWindowValue(browser, populate_tabs));
return true;
}
bool GetAllWindowsFunction::RunImpl() {
bool populate_tabs = false;
if (HasOptionalArgument(0)) {
- DictionaryValue* args;
+ DictionaryValue* args = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args));
if (args->HasKey(keys::kPopulateKey)) {
@@ -352,7 +385,7 @@
// Look for optional tab id.
if (args) {
- int tab_id;
+ int tab_id = -1;
if (args->HasKey(keys::kTabIdKey)) {
EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kTabIdKey, &tab_id));
@@ -403,7 +436,7 @@
std::string extension_id;
// Decide whether we are opening a normal window or an incognito window.
- bool is_error;
+ bool is_error = true;
bool open_incognito_window = ShouldOpenIncognitoWindow(args, &urls,
&is_error);
if (is_error) {
@@ -416,7 +449,7 @@
if (args) {
// Any part of the bounds can optionally be set by the caller.
- int bounds_val;
+ int bounds_val = -1;
if (args->HasKey(keys::kLeftKey)) {
EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kLeftKey,
&bounds_val));
@@ -517,7 +550,7 @@
}
bool UpdateWindowFunction::RunImpl() {
- int window_id;
+ int window_id = -1;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
DictionaryValue* update_props;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
@@ -640,7 +673,7 @@
}
bool RemoveWindowFunction::RunImpl() {
- int window_id;
+ int window_id = -1;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &window_id));
Browser* browser = GetBrowserInProfileWithId(profile(), window_id,
@@ -802,7 +835,7 @@
}
bool CreateTabFunction::RunImpl() {
- DictionaryValue* args;
+ DictionaryValue* args = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &args));
Browser *browser;
@@ -913,7 +946,7 @@
}
bool GetTabFunction::RunImpl() {
- int tab_id;
+ int tab_id = -1;
EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
TabStripModel* tab_strip = NULL;
@@ -1001,7 +1034,7 @@
}
bool UpdateTabFunction::RunImpl() {
- DictionaryValue* update_props;
+ DictionaryValue* update_props = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
Value* tab_value = NULL;
@@ -1151,7 +1184,7 @@
if (message.type() != ExtensionHostMsg_ExecuteCodeFinished::ID)
return false;
- int message_request_id;
+ int message_request_id = -1;
void* iter = NULL;
if (!message.ReadInt(&iter, &message_request_id)) {
NOTREACHED() << "malformed extension message";
@@ -1189,10 +1222,10 @@
std::vector<int> tab_ids;
EXTENSION_FUNCTION_VALIDATE(ReadOneOrMoreIntegers(tab_value, &tab_ids));
- DictionaryValue* update_props;
+ DictionaryValue* update_props = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &update_props));
- int new_index;
+ int new_index = -1;
EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
keys::kIndexKey, &new_index));
EXTENSION_FUNCTION_VALIDATE(new_index >= 0);
@@ -1218,8 +1251,8 @@
new_index += i;
if (update_props->HasKey(keys::kWindowIdKey)) {
- Browser* target_browser;
- int window_id;
+ Browser* target_browser = NULL;
+ int window_id = -1;
EXTENSION_FUNCTION_VALIDATE(update_props->GetInteger(
keys::kWindowIdKey, &window_id));
target_browser = GetBrowserInProfileWithId(profile(), window_id,
@@ -1328,7 +1361,7 @@
if (!ExtensionTabUtil::GetDefaultTab(browser, &contents, NULL))
return false;
} else {
- int tab_id;
+ int tab_id = -1;
EXTENSION_FUNCTION_VALIDATE(tab_value->GetAsInteger(&tab_id));
Browser* browser = NULL;
@@ -1384,7 +1417,7 @@
}
bool CaptureVisibleTabFunction::RunImpl() {
- Browser* browser;
+ Browser* browser = NULL;
// windowId defaults to "current" window.
int window_id = -1;
@@ -1405,7 +1438,7 @@
image_quality_ = kDefaultQuality; // Default quality setting.
if (HasOptionalArgument(1)) {
- DictionaryValue* options;
+ DictionaryValue* options = NULL;
EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &options));
if (options->HasKey(keys::kFormatKey)) {
« no previous file with comments | « chrome/browser/extensions/extension_function_test_utils.cc ('k') | chrome/browser/extensions/extension_tabs_test.cc » ('j') | chrome/browser/extensions/extension_tabs_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698