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

Unified Diff: chrome/browser/extensions/api/app_window/app_window_api.cc

Issue 10456003: Make 'options' and callback arg to chrome.appWindow.create optional. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 8 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/app_window/app_window_api.cc
diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc
index edb97d6308771f6036289c04e42427a8f3764a06..dddad886fceb3e7296178af6c40fd2902048632b 100644
--- a/chrome/browser/extensions/api/app_window/app_window_api.cc
+++ b/chrome/browser/extensions/api/app_window/app_window_api.cc
@@ -31,14 +31,17 @@ bool AppWindowCreateFunction::RunImpl() {
// ShellWindow::Create so we can set the opener at create time rather than
// with a hack in AppWindowCustomBindings::GetView().
ShellWindow::CreateParams create_params;
- if (params->options.width.get())
- create_params.bounds.set_width(*params->options.width.get());
- if (params->options.height.get())
- create_params.bounds.set_height(*params->options.height.get());
- if (params->options.left.get())
- create_params.bounds.set_x(*params->options.left.get());
- if (params->options.top.get())
- create_params.bounds.set_y(*params->options.top.get());
+ app_window::CreateWindowOptions* options = params->options.get();
+ if (options) {
+ if (options->width.get())
+ create_params.bounds.set_width(*options->width.get());
+ if (options->height.get())
+ create_params.bounds.set_height(*options->height.get());
+ if (options->left.get())
+ create_params.bounds.set_x(*options->left.get());
+ if (options->top.get())
+ create_params.bounds.set_y(*options->top.get());
+ }
ShellWindow* shell_window =
ShellWindow::Create(profile(), GetExtension(), url, create_params);
shell_window->Show();
« no previous file with comments | « no previous file | chrome/common/extensions/api/app_window.idl » ('j') | chrome/common/extensions/api/app_window.idl » ('J')

Powered by Google App Engine
This is Rietveld 408576698