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

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

Issue 1914993002: Enhance chrome.app.window API with better shelf integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + Fixes Created 4 years, 6 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
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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 } 314 }
315 315
316 if (options->focused.get()) 316 if (options->focused.get())
317 create_params.focused = *options->focused.get(); 317 create_params.focused = *options->focused.get();
318 318
319 if (options->visible_on_all_workspaces.get()) { 319 if (options->visible_on_all_workspaces.get()) {
320 create_params.visible_on_all_workspaces = 320 create_params.visible_on_all_workspaces =
321 *options->visible_on_all_workspaces.get(); 321 *options->visible_on_all_workspaces.get();
322 } 322 }
323 323
324 if (options->show_in_shelf.get())
325 create_params.show_in_shelf = *options->show_in_shelf.get();
326
324 if (options->type != app_window::WINDOW_TYPE_PANEL) { 327 if (options->type != app_window::WINDOW_TYPE_PANEL) {
325 switch (options->state) { 328 switch (options->state) {
326 case app_window::STATE_NONE: 329 case app_window::STATE_NONE:
327 case app_window::STATE_NORMAL: 330 case app_window::STATE_NORMAL:
328 break; 331 break;
329 case app_window::STATE_FULLSCREEN: 332 case app_window::STATE_FULLSCREEN:
330 create_params.state = ui::SHOW_STATE_FULLSCREEN; 333 create_params.state = ui::SHOW_STATE_FULLSCREEN;
331 break; 334 break;
332 case app_window::STATE_MAXIMIZED: 335 case app_window::STATE_MAXIMIZED:
333 create_params.state = ui::SHOW_STATE_MAXIMIZED; 336 create_params.state = ui::SHOW_STATE_MAXIMIZED;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 556
554 if (options.frame->as_frame_options->inactive_color.get()) { 557 if (options.frame->as_frame_options->inactive_color.get()) {
555 error_ = app_window_constants::kInactiveColorWithoutColor; 558 error_ = app_window_constants::kInactiveColorWithoutColor;
556 return false; 559 return false;
557 } 560 }
558 561
559 return true; 562 return true;
560 } 563 }
561 564
562 } // namespace extensions 565 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698