Chromium Code Reviews| 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 "views/widget/native_widget_aura.h" | 5 #include "views/widget/native_widget_aura.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
| 9 #include "ui/aura/desktop.h" | 9 #include "ui/aura/desktop.h" |
| 10 #include "ui/aura/desktop_observer.h" | 10 #include "ui/aura/desktop_observer.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 } | 149 } |
| 150 // TODO(beng): do this some other way. | 150 // TODO(beng): do this some other way. |
| 151 delegate_->OnNativeWidgetSizeChanged(params.bounds.size()); | 151 delegate_->OnNativeWidgetSizeChanged(params.bounds.size()); |
| 152 can_activate_ = params.can_activate; | 152 can_activate_ = params.can_activate; |
| 153 if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) { | 153 if (params.type != Widget::InitParams::TYPE_TOOLTIP && !params.child) { |
| 154 DCHECK(GetWidget()->GetRootView()); | 154 DCHECK(GetWidget()->GetRootView()); |
| 155 views::TooltipManagerViews* manager = new views::TooltipManagerViews( | 155 views::TooltipManagerViews* manager = new views::TooltipManagerViews( |
| 156 GetWidget()->GetRootView()); | 156 GetWidget()->GetRootView()); |
| 157 tooltip_manager_.reset(manager); | 157 tooltip_manager_.reset(manager); |
| 158 } | 158 } |
| 159 | |
| 160 if (window_type == Widget::InitParams::TYPE_MENU) | |
| 161 window_->SetShadowVisible(true); | |
|
Daniel Erat
2011/11/15 01:05:04
Doing this from Views seems a bit gross to me. Op
sky
2011/11/15 04:49:13
Why? This seems like the right place to me. The ot
| |
| 159 } | 162 } |
|
sky
2011/11/15 04:50:40
One more comment here. Are we really going to only
Daniel Erat
2011/11/15 17:52:58
Yes, they're getting enabled in browser_frame_aura
| |
| 160 | 163 |
| 161 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() { | 164 NonClientFrameView* NativeWidgetAura::CreateNonClientFrameView() { |
| 162 return NULL; | 165 return NULL; |
| 163 } | 166 } |
| 164 | 167 |
| 165 void NativeWidgetAura::UpdateFrameAfterFrameChange() { | 168 void NativeWidgetAura::UpdateFrameAfterFrameChange() { |
| 166 // We don't support changing the frame type. | 169 // We don't support changing the frame type. |
| 167 NOTREACHED(); | 170 NOTREACHED(); |
| 168 } | 171 } |
| 169 | 172 |
| (...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 722 NOTIMPLEMENTED(); | 725 NOTIMPLEMENTED(); |
| 723 } | 726 } |
| 724 | 727 |
| 725 // static | 728 // static |
| 726 bool NativeWidgetPrivate::IsMouseButtonDown() { | 729 bool NativeWidgetPrivate::IsMouseButtonDown() { |
| 727 return aura::Desktop::GetInstance()->IsMouseButtonDown(); | 730 return aura::Desktop::GetInstance()->IsMouseButtonDown(); |
| 728 } | 731 } |
| 729 | 732 |
| 730 } // namespace internal | 733 } // namespace internal |
| 731 } // namespace views | 734 } // namespace views |
| OLD | NEW |