| OLD | NEW |
| 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 "ash/wm/frame_painter.h" | 5 #include "ash/wm/frame_painter.h" |
| 6 | 6 |
| 7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/shell_window_ids.h" | 9 #include "ash/shell_window_ids.h" |
| 10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
| (...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 459 } | 459 } |
| 460 | 460 |
| 461 void FramePainter::LayoutHeader(views::NonClientFrameView* view, | 461 void FramePainter::LayoutHeader(views::NonClientFrameView* view, |
| 462 bool maximized_layout) { | 462 bool maximized_layout) { |
| 463 // The maximized layout uses shorter buttons. | 463 // The maximized layout uses shorter buttons. |
| 464 if (maximized_layout) { | 464 if (maximized_layout) { |
| 465 SetButtonImages(close_button_, | 465 SetButtonImages(close_button_, |
| 466 IDR_AURA_WINDOW_MAXIMIZED_CLOSE, | 466 IDR_AURA_WINDOW_MAXIMIZED_CLOSE, |
| 467 IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H, | 467 IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H, |
| 468 IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P); | 468 IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P); |
| 469 if (size_button_behavior_ == SIZE_BUTTON_MINIMIZES) { | 469 // The chat window cannot be restored but only minimized. |
| 470 SetButtonImages(size_button_, | 470 // Case: (size_button_behavior_ == SIZE_BUTTON_MINIMIZES). We used to have |
| 471 IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE, | 471 // a special set of artwork to show this case, but per discussion we |
| 472 IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H, | 472 // removed this. |
| 473 IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P); | 473 SetButtonImages(size_button_, |
| 474 } else { | 474 IDR_AURA_WINDOW_MAXIMIZED_RESTORE, |
| 475 SetButtonImages(size_button_, | 475 IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H, |
| 476 IDR_AURA_WINDOW_MAXIMIZED_RESTORE, | 476 IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P); |
| 477 IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H, | |
| 478 IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P); | |
| 479 } | |
| 480 } else { | 477 } else { |
| 481 SetButtonImages(close_button_, | 478 SetButtonImages(close_button_, |
| 482 IDR_AURA_WINDOW_CLOSE, | 479 IDR_AURA_WINDOW_CLOSE, |
| 483 IDR_AURA_WINDOW_CLOSE_H, | 480 IDR_AURA_WINDOW_CLOSE_H, |
| 484 IDR_AURA_WINDOW_CLOSE_P); | 481 IDR_AURA_WINDOW_CLOSE_P); |
| 485 // TODO(jamescook): If we ever have normal-layout windows (with the | |
| 486 // standard 35 pixel tall headers) that can only minimize, we'll need art | |
| 487 // assets for SIZE_BUTTON_MINIMIZES. As of R19 we don't use them. | |
| 488 SetButtonImages(size_button_, | 482 SetButtonImages(size_button_, |
| 489 IDR_AURA_WINDOW_MAXIMIZE, | 483 IDR_AURA_WINDOW_MAXIMIZE, |
| 490 IDR_AURA_WINDOW_MAXIMIZE_H, | 484 IDR_AURA_WINDOW_MAXIMIZE_H, |
| 491 IDR_AURA_WINDOW_MAXIMIZE_P); | 485 IDR_AURA_WINDOW_MAXIMIZE_P); |
| 492 } | 486 } |
| 493 | 487 |
| 494 gfx::Size close_size = close_button_->GetPreferredSize(); | 488 gfx::Size close_size = close_button_->GetPreferredSize(); |
| 495 close_button_->SetBounds( | 489 close_button_->SetBounds( |
| 496 view->width() - close_size.width() - kCloseButtonOffsetX, | 490 view->width() - close_size.width() - kCloseButtonOffsetX, |
| 497 kCloseButtonOffsetY, | 491 kCloseButtonOffsetY, |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 for (std::set<FramePainter*>::const_iterator it = instances_->begin(); | 621 for (std::set<FramePainter*>::const_iterator it = instances_->begin(); |
| 628 it != instances_->end(); | 622 it != instances_->end(); |
| 629 ++it) { | 623 ++it) { |
| 630 FramePainter* painter = *it; | 624 FramePainter* painter = *it; |
| 631 if (IsVisibleNormalWindow(painter->window_)) | 625 if (IsVisibleNormalWindow(painter->window_)) |
| 632 painter->frame_->non_client_view()->SchedulePaint(); | 626 painter->frame_->non_client_view()->SchedulePaint(); |
| 633 } | 627 } |
| 634 } | 628 } |
| 635 | 629 |
| 636 } // namespace ash | 630 } // namespace ash |
| OLD | NEW |