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/app_non_client_frame_view_aura.h" | 5 #include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h" |
6 | 6 |
7 #include "base/debug/stack_trace.h" | 7 #include "base/debug/stack_trace.h" |
8 #include "chrome/browser/ui/views/frame/browser_frame.h" | 8 #include "chrome/browser/ui/views/frame/browser_frame.h" |
9 #include "chrome/browser/ui/views/frame/browser_view.h" | 9 #include "chrome/browser/ui/views/frame/browser_view.h" |
10 #include "grit/generated_resources.h" // Accessibility names | 10 #include "grit/generated_resources.h" // Accessibility names |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 } | 233 } |
234 | 234 |
235 int AppNonClientFrameViewAura::GetThemeBackgroundXInset() const { | 235 int AppNonClientFrameViewAura::GetThemeBackgroundXInset() const { |
236 return 0; | 236 return 0; |
237 } | 237 } |
238 | 238 |
239 void AppNonClientFrameViewAura::UpdateThrobber(bool running) { | 239 void AppNonClientFrameViewAura::UpdateThrobber(bool running) { |
240 } | 240 } |
241 | 241 |
242 void AppNonClientFrameViewAura::OnMouseEntered( | 242 void AppNonClientFrameViewAura::OnMouseEntered( |
243 const views::MouseEvent& event) { | 243 const ui::MouseEvent& event) { |
244 if (!control_view_) { | 244 if (!control_view_) { |
245 // This can only happen when the frame-view (|this|) is in the process of | 245 // This can only happen when the frame-view (|this|) is in the process of |
246 // destroying itself, but the control-widget has already closed, and some | 246 // destroying itself, but the control-widget has already closed, and some |
247 // mouse event (possibly queued in the event-stream) has arrived. In such | 247 // mouse event (possibly queued in the event-stream) has arrived. In such |
248 // cases, do not do anything. | 248 // cases, do not do anything. |
249 return; | 249 return; |
250 } | 250 } |
251 | 251 |
252 if (!control_widget_) { | 252 if (!control_widget_) { |
253 control_widget_ = new views::Widget; | 253 control_widget_ = new views::Widget; |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 bool AppNonClientFrameViewAura::IsShowingControls() const { | 321 bool AppNonClientFrameViewAura::IsShowingControls() const { |
322 return control_widget_ && control_widget_->IsVisible(); | 322 return control_widget_ && control_widget_->IsVisible(); |
323 } | 323 } |
324 | 324 |
325 void AppNonClientFrameViewAura::Restore() { | 325 void AppNonClientFrameViewAura::Restore() { |
326 if (control_widget_) | 326 if (control_widget_) |
327 control_widget_->Close(); | 327 control_widget_->Close(); |
328 mouse_watcher_.Stop(); | 328 mouse_watcher_.Stop(); |
329 frame()->Restore(); | 329 frame()->Restore(); |
330 } | 330 } |
OLD | NEW |