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/ash/panel_view_aura.h" | 5 #include "chrome/browser/ui/views/ash/panel_view_aura.h" |
6 | 6 |
7 #include "ash/wm/panel_frame_view.h" | 7 #include "ash/wm/panel_frame_view.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 10 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
391 | 391 |
392 gfx::NativeWindow PanelViewAura::GetNativeWindow() { | 392 gfx::NativeWindow PanelViewAura::GetNativeWindow() { |
393 return GetWidget()->GetNativeWindow(); | 393 return GetWidget()->GetNativeWindow(); |
394 } | 394 } |
395 | 395 |
396 gfx::Rect PanelViewAura::GetRestoredBounds() const { | 396 gfx::Rect PanelViewAura::GetRestoredBounds() const { |
397 return GetWidget()->GetRestoredBounds(); | 397 return GetWidget()->GetRestoredBounds(); |
398 } | 398 } |
399 | 399 |
400 gfx::Rect PanelViewAura::GetBounds() const { | 400 gfx::Rect PanelViewAura::GetBounds() const { |
401 return GetWidget()->GetWindowScreenBounds(); | 401 return GetWidget()->GetWindowBoundsInScreen(); |
402 } | 402 } |
403 | 403 |
404 void PanelViewAura::Show() { | 404 void PanelViewAura::Show() { |
405 GetWidget()->Show(); | 405 GetWidget()->Show(); |
406 } | 406 } |
407 | 407 |
408 void PanelViewAura::ShowInactive() { | 408 void PanelViewAura::ShowInactive() { |
409 GetWidget()->ShowInactive(); | 409 GetWidget()->ShowInactive(); |
410 } | 410 } |
411 | 411 |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 } | 446 } |
447 | 447 |
448 void PanelViewAura::FlashFrame(bool flash) { | 448 void PanelViewAura::FlashFrame(bool flash) { |
449 // TODO(stevenjb): Implement | 449 // TODO(stevenjb): Implement |
450 NOTIMPLEMENTED(); | 450 NOTIMPLEMENTED(); |
451 } | 451 } |
452 | 452 |
453 bool PanelViewAura::IsAlwaysOnTop() const { | 453 bool PanelViewAura::IsAlwaysOnTop() const { |
454 return true; | 454 return true; |
455 } | 455 } |
OLD | NEW |