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

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

Issue 469993003: Add AppWindow.setVisibleOnAllWorkspaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and rebase Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
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 "chrome/browser/extensions/api/app_window/app_window_api.h" 5 #include "chrome/browser/extensions/api/app_window/app_window_api.h"
6 6
7 #include "apps/app_window.h" 7 #include "apps/app_window.h"
8 #include "apps/app_window_contents.h" 8 #include "apps/app_window_contents.h"
9 #include "apps/app_window_registry.h" 9 #include "apps/app_window_registry.h"
10 #include "apps/ui/apps_client.h" 10 #include "apps/ui/apps_client.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 !extension()->permissions_data()->HasAPIPermission( 287 !extension()->permissions_data()->HasAPIPermission(
288 APIPermission::kAlwaysOnTopWindows)) { 288 APIPermission::kAlwaysOnTopWindows)) {
289 error_ = app_window_constants::kAlwaysOnTopPermission; 289 error_ = app_window_constants::kAlwaysOnTopPermission;
290 return false; 290 return false;
291 } 291 }
292 } 292 }
293 293
294 if (options->focused.get()) 294 if (options->focused.get())
295 create_params.focused = *options->focused.get(); 295 create_params.focused = *options->focused.get();
296 296
297 if (options->visible_on_all_workspaces.get()) {
298 create_params.visible_on_all_workspaces =
299 *options->visible_on_all_workspaces.get();
300 }
301
297 if (options->type != extensions::api::app_window::WINDOW_TYPE_PANEL) { 302 if (options->type != extensions::api::app_window::WINDOW_TYPE_PANEL) {
298 switch (options->state) { 303 switch (options->state) {
299 case extensions::api::app_window::STATE_NONE: 304 case extensions::api::app_window::STATE_NONE:
300 case extensions::api::app_window::STATE_NORMAL: 305 case extensions::api::app_window::STATE_NORMAL:
301 break; 306 break;
302 case extensions::api::app_window::STATE_FULLSCREEN: 307 case extensions::api::app_window::STATE_FULLSCREEN:
303 create_params.state = ui::SHOW_STATE_FULLSCREEN; 308 create_params.state = ui::SHOW_STATE_FULLSCREEN;
304 break; 309 break;
305 case extensions::api::app_window::STATE_MAXIMIZED: 310 case extensions::api::app_window::STATE_MAXIMIZED:
306 create_params.state = ui::SHOW_STATE_MAXIMIZED; 311 create_params.state = ui::SHOW_STATE_MAXIMIZED;
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 529
525 if (options.frame->as_frame_options->inactive_color.get()) { 530 if (options.frame->as_frame_options->inactive_color.get()) {
526 error_ = app_window_constants::kInactiveColorWithoutColor; 531 error_ = app_window_constants::kInactiveColorWithoutColor;
527 return false; 532 return false;
528 } 533 }
529 534
530 return true; 535 return true;
531 } 536 }
532 537
533 } // namespace extensions 538 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698