| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/views/frame/app_panel_browser_frame_view.h" | 5 #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 DCHECK(browser_view->ShouldShowWindowTitle()); | 66 DCHECK(browser_view->ShouldShowWindowTitle()); |
| 67 | 67 |
| 68 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 68 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 69 close_button_->SetImage(views::CustomButton::BS_NORMAL, | 69 close_button_->SetImage(views::CustomButton::BS_NORMAL, |
| 70 rb.GetBitmapNamed(IDR_CLOSE_BAR)); | 70 rb.GetBitmapNamed(IDR_CLOSE_BAR)); |
| 71 close_button_->SetImage(views::CustomButton::BS_HOT, | 71 close_button_->SetImage(views::CustomButton::BS_HOT, |
| 72 rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); | 72 rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); |
| 73 close_button_->SetImage(views::CustomButton::BS_PUSHED, | 73 close_button_->SetImage(views::CustomButton::BS_PUSHED, |
| 74 rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); | 74 rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); |
| 75 close_button_->SetAccessibleName( | 75 close_button_->SetAccessibleName( |
| 76 UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE))); | 76 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); |
| 77 AddChildView(close_button_); | 77 AddChildView(close_button_); |
| 78 | 78 |
| 79 window_icon_ = new TabIconView(this); | 79 window_icon_ = new TabIconView(this); |
| 80 window_icon_->set_is_light(true); | 80 window_icon_->set_is_light(true); |
| 81 AddChildView(window_icon_); | 81 AddChildView(window_icon_); |
| 82 window_icon_->Update(); | 82 window_icon_->Update(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 AppPanelBrowserFrameView::~AppPanelBrowserFrameView() { | 85 AppPanelBrowserFrameView::~AppPanelBrowserFrameView() { |
| 86 } | 86 } |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 498 } | 498 } |
| 499 | 499 |
| 500 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width, | 500 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width, |
| 501 int height) const { | 501 int height) const { |
| 502 int top_height = NonClientTopBorderHeight(); | 502 int top_height = NonClientTopBorderHeight(); |
| 503 int border_thickness = NonClientBorderThickness(); | 503 int border_thickness = NonClientBorderThickness(); |
| 504 return gfx::Rect(border_thickness, top_height, | 504 return gfx::Rect(border_thickness, top_height, |
| 505 std::max(0, width - (2 * border_thickness)), | 505 std::max(0, width - (2 * border_thickness)), |
| 506 std::max(0, height - top_height - border_thickness)); | 506 std::max(0, height - top_height - border_thickness)); |
| 507 } | 507 } |
| OLD | NEW |