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

Side by Side Diff: extensions/browser/api/app_window/app_window_api.cc

Issue 2484413002: Enhance chrome.app.window API with title property
Patch Set: Rebase Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/api/app_window/app_window_api.h" 5 #include "extensions/browser/api/app_window/app_window_api.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // First, check if the window icon URL is a valid global URL. 336 // First, check if the window icon URL is a valid global URL.
337 create_params.window_icon_url = GURL(*options->icon.get()); 337 create_params.window_icon_url = GURL(*options->icon.get());
338 338
339 // If the URL is not global, check for a valid extension local URL. 339 // If the URL is not global, check for a valid extension local URL.
340 if (!create_params.window_icon_url.is_valid()) { 340 if (!create_params.window_icon_url.is_valid()) {
341 create_params.window_icon_url = 341 create_params.window_icon_url =
342 extension()->GetResourceURL(*options->icon.get()); 342 extension()->GetResourceURL(*options->icon.get());
343 } 343 }
344 } 344 }
345 345
346 if (options->title.get())
347 create_params.title = *options->title;
348
346 if (options->type != app_window::WINDOW_TYPE_PANEL) { 349 if (options->type != app_window::WINDOW_TYPE_PANEL) {
347 switch (options->state) { 350 switch (options->state) {
348 case app_window::STATE_NONE: 351 case app_window::STATE_NONE:
349 case app_window::STATE_NORMAL: 352 case app_window::STATE_NORMAL:
350 break; 353 break;
351 case app_window::STATE_FULLSCREEN: 354 case app_window::STATE_FULLSCREEN:
352 create_params.state = ui::SHOW_STATE_FULLSCREEN; 355 create_params.state = ui::SHOW_STATE_FULLSCREEN;
353 break; 356 break;
354 case app_window::STATE_MAXIMIZED: 357 case app_window::STATE_MAXIMIZED:
355 create_params.state = ui::SHOW_STATE_MAXIMIZED; 358 create_params.state = ui::SHOW_STATE_MAXIMIZED;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 578
576 if (options.frame->as_frame_options->inactive_color.get()) { 579 if (options.frame->as_frame_options->inactive_color.get()) {
577 error_ = app_window_constants::kInactiveColorWithoutColor; 580 error_ = app_window_constants::kInactiveColorWithoutColor;
578 return false; 581 return false;
579 } 582 }
580 583
581 return true; 584 return true;
582 } 585 }
583 586
584 } // namespace extensions 587 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698