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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h" | 5 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h" |
6 | 6 |
7 #include "ash/wm/frame_painter.h" | 7 #include "ash/wm/frame_painter.h" |
8 #include "ash/wm/workspace/frame_maximize_button.h" | 8 #include "ash/wm/workspace/frame_maximize_button.h" |
9 #include "chrome/browser/themes/theme_service.h" | 9 #include "chrome/browser/themes/theme_service.h" |
10 #include "chrome/browser/ui/views/avatar_menu_button.h" | 10 #include "chrome/browser/ui/views/avatar_menu_button.h" |
11 #include "chrome/browser/ui/views/frame/browser_frame.h" | 11 #include "chrome/browser/ui/views/frame/browser_frame.h" |
12 #include "chrome/browser/ui/views/frame/browser_view.h" | 12 #include "chrome/browser/ui/views/frame/browser_view.h" |
13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
14 #include "grit/generated_resources.h" // Accessibility names | 14 #include "grit/generated_resources.h" // Accessibility names |
15 #include "grit/theme_resources.h" | 15 #include "grit/theme_resources.h" |
16 #include "grit/theme_resources_standard.h" | 16 #include "grit/theme_resources_standard.h" |
17 #include "grit/ui_resources.h" | 17 #include "grit/ui_resources.h" |
18 #include "ui/aura/window.h" | |
19 #include "ui/aura/client/aura_constants.h" | |
18 #include "ui/base/accessibility/accessible_view_state.h" | 20 #include "ui/base/accessibility/accessible_view_state.h" |
19 #include "ui/base/hit_test.h" | 21 #include "ui/base/hit_test.h" |
20 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
21 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
22 #include "ui/base/theme_provider.h" | 24 #include "ui/base/theme_provider.h" |
23 #include "ui/gfx/canvas.h" | 25 #include "ui/gfx/canvas.h" |
24 #include "ui/views/controls/button/image_button.h" | 26 #include "ui/views/controls/button/image_button.h" |
25 #include "ui/views/widget/widget.h" | 27 #include "ui/views/widget/widget.h" |
26 #include "ui/views/widget/widget_delegate.h" | 28 #include "ui/views/widget/widget_delegate.h" |
27 | 29 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
63 close_button_(NULL), | 65 close_button_(NULL), |
64 window_icon_(NULL), | 66 window_icon_(NULL), |
65 frame_painter_(new ash::FramePainter) { | 67 frame_painter_(new ash::FramePainter) { |
66 } | 68 } |
67 | 69 |
68 BrowserNonClientFrameViewAura::~BrowserNonClientFrameViewAura() { | 70 BrowserNonClientFrameViewAura::~BrowserNonClientFrameViewAura() { |
69 } | 71 } |
70 | 72 |
71 void BrowserNonClientFrameViewAura::Init() { | 73 void BrowserNonClientFrameViewAura::Init() { |
72 // Caption buttons. | 74 // Caption buttons. |
73 maximize_button_ = new ash::FrameMaximizeButton(this, this); | 75 ash::FrameMaximizeButton* maximize_button = |
76 new ash::FrameMaximizeButton(this, this); | |
77 maximize_button_ = maximize_button; | |
78 // Disable snap left/right and maximize for always-on-top windows | |
79 // (e.g. Panels). | |
80 if (frame()->GetNativeWindow()->GetProperty( | |
sky
2012/03/25 22:53:05
Can we be more explicit and look for panels here r
stevenjb
2012/03/25 23:11:37
Resizing Panels works fine, but the behavior is br
| |
81 aura::client::kAlwaysOnTopKey)) { | |
82 maximize_button->set_is_left_right_enabled(false); | |
83 maximize_button->set_is_maximize_enabled(false); | |
84 } | |
74 maximize_button_->SetAccessibleName( | 85 maximize_button_->SetAccessibleName( |
75 l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE)); | 86 l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE)); |
76 AddChildView(maximize_button_); | 87 AddChildView(maximize_button_); |
77 close_button_ = new views::ImageButton(this); | 88 close_button_ = new views::ImageButton(this); |
78 close_button_->SetAccessibleName( | 89 close_button_->SetAccessibleName( |
79 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); | 90 l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); |
80 AddChildView(close_button_); | 91 AddChildView(close_button_); |
81 | 92 |
82 // Initializing the TabIconView is expensive, so only do it if we need to. | 93 // Initializing the TabIconView is expensive, so only do it if we need to. |
83 if (browser_view()->ShouldShowWindowIcon()) { | 94 if (browser_view()->ShouldShowWindowIcon()) { |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
232 } | 243 } |
233 | 244 |
234 /////////////////////////////////////////////////////////////////////////////// | 245 /////////////////////////////////////////////////////////////////////////////// |
235 // views::ButtonListener overrides: | 246 // views::ButtonListener overrides: |
236 | 247 |
237 void BrowserNonClientFrameViewAura::ButtonPressed(views::Button* sender, | 248 void BrowserNonClientFrameViewAura::ButtonPressed(views::Button* sender, |
238 const views::Event& event) { | 249 const views::Event& event) { |
239 if (sender == maximize_button_) { | 250 if (sender == maximize_button_) { |
240 // The maximize button may move out from under the cursor. | 251 // The maximize button may move out from under the cursor. |
241 ResetWindowControls(); | 252 ResetWindowControls(); |
253 // Don't maximize if always-on-top (e.g. Panels). | |
254 if (frame()->GetNativeWindow()->GetProperty(aura::client::kAlwaysOnTopKey)) | |
255 return; | |
242 if (frame()->IsMaximized()) | 256 if (frame()->IsMaximized()) |
243 frame()->Restore(); | 257 frame()->Restore(); |
244 else | 258 else |
245 frame()->Maximize(); | 259 frame()->Maximize(); |
246 // |this| may be deleted - some windows delete their frames on maximize. | 260 // |this| may be deleted - some windows delete their frames on maximize. |
247 } else if (sender == close_button_) { | 261 } else if (sender == close_button_) { |
248 frame()->Close(); | 262 frame()->Close(); |
249 } | 263 } |
250 } | 264 } |
251 | 265 |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
430 } | 444 } |
431 | 445 |
432 SkBitmap* BrowserNonClientFrameViewAura::GetCustomBitmap( | 446 SkBitmap* BrowserNonClientFrameViewAura::GetCustomBitmap( |
433 int bitmap_id, | 447 int bitmap_id, |
434 int fallback_bitmap_id) const { | 448 int fallback_bitmap_id) const { |
435 ui::ThemeProvider* tp = GetThemeProvider(); | 449 ui::ThemeProvider* tp = GetThemeProvider(); |
436 if (tp->HasCustomImage(bitmap_id)) | 450 if (tp->HasCustomImage(bitmap_id)) |
437 return tp->GetBitmapNamed(bitmap_id); | 451 return tp->GetBitmapNamed(bitmap_id); |
438 return tp->GetBitmapNamed(fallback_bitmap_id); | 452 return tp->GetBitmapNamed(fallback_bitmap_id); |
439 } | 453 } |
OLD | NEW |