| 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/panels/panel_browser_view.h" | 5 #include "chrome/browser/ui/panels/panel_browser_view.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "chrome/browser/native_window_notification_source.h" | 9 #include "chrome/browser/native_window_notification_source.h" |
| 10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 101 |
| 102 void PanelBrowserView::Deactivate() { | 102 void PanelBrowserView::Deactivate() { |
| 103 if (!IsActive()) | 103 if (!IsActive()) |
| 104 return; | 104 return; |
| 105 | 105 |
| 106 #if defined(OS_WIN) && !defined(USE_AURA) | 106 #if defined(OS_WIN) && !defined(USE_AURA) |
| 107 gfx::NativeWindow native_window = NULL; | 107 gfx::NativeWindow native_window = NULL; |
| 108 BrowserWindow* browser_window = | 108 BrowserWindow* browser_window = |
| 109 panel_->manager()->GetNextBrowserWindowToActivate(GetPanelBrowser()); | 109 panel_->manager()->GetNextBrowserWindowToActivate(GetPanelBrowser()); |
| 110 if (browser_window) | 110 if (browser_window) |
| 111 native_window = browser_window->GetNativeHandle(); | 111 native_window = browser_window->GetNativeWindow(); |
| 112 else | 112 else |
| 113 native_window = ::GetDesktopWindow(); | 113 native_window = ::GetDesktopWindow(); |
| 114 if (native_window) | 114 if (native_window) |
| 115 ::SetForegroundWindow(native_window); | 115 ::SetForegroundWindow(native_window); |
| 116 else | 116 else |
| 117 ::SetFocus(NULL); | 117 ::SetFocus(NULL); |
| 118 #else | 118 #else |
| 119 NOTIMPLEMENTED(); | 119 NOTIMPLEMENTED(); |
| 120 BrowserView::Deactivate(); | 120 BrowserView::Deactivate(); |
| 121 #endif | 121 #endif |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 // the minimized panels do not get activated by the OS, but | 334 // the minimized panels do not get activated by the OS, but |
| 335 // do appear in the taskbar and Alt-Tab menu. | 335 // do appear in the taskbar and Alt-Tab menu. |
| 336 UpdateWindowAttribute(GWL_EXSTYLE, | 336 UpdateWindowAttribute(GWL_EXSTYLE, |
| 337 WS_EX_NOACTIVATE | WS_EX_APPWINDOW, | 337 WS_EX_NOACTIVATE | WS_EX_APPWINDOW, |
| 338 prevent_activation); | 338 prevent_activation); |
| 339 #endif | 339 #endif |
| 340 } | 340 } |
| 341 | 341 |
| 342 | 342 |
| 343 gfx::NativeWindow PanelBrowserView::GetNativePanelHandle() { | 343 gfx::NativeWindow PanelBrowserView::GetNativePanelHandle() { |
| 344 return GetNativeHandle(); | 344 return GetNativeWindow(); |
| 345 } | 345 } |
| 346 | 346 |
| 347 void PanelBrowserView::UpdatePanelTitleBar() { | 347 void PanelBrowserView::UpdatePanelTitleBar() { |
| 348 UpdateTitleBar(); | 348 UpdateTitleBar(); |
| 349 } | 349 } |
| 350 | 350 |
| 351 void PanelBrowserView::UpdatePanelLoadingAnimations(bool should_animate) { | 351 void PanelBrowserView::UpdatePanelLoadingAnimations(bool should_animate) { |
| 352 UpdateLoadingAnimations(should_animate); | 352 UpdateLoadingAnimations(should_animate); |
| 353 } | 353 } |
| 354 | 354 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 438 Browser* PanelBrowserView::GetPanelBrowser() const { | 438 Browser* PanelBrowserView::GetPanelBrowser() const { |
| 439 return browser(); | 439 return browser(); |
| 440 } | 440 } |
| 441 | 441 |
| 442 void PanelBrowserView::DestroyPanelBrowser() { | 442 void PanelBrowserView::DestroyPanelBrowser() { |
| 443 DestroyBrowser(); | 443 DestroyBrowser(); |
| 444 } | 444 } |
| 445 | 445 |
| 446 void PanelBrowserView::EnsurePanelFullyVisible() { | 446 void PanelBrowserView::EnsurePanelFullyVisible() { |
| 447 #if defined(OS_WIN) && !defined(USE_AURA) | 447 #if defined(OS_WIN) && !defined(USE_AURA) |
| 448 ::SetWindowPos(GetNativeHandle(), HWND_TOP, 0, 0, 0, 0, | 448 ::SetWindowPos(GetNativeWindow(), HWND_TOP, 0, 0, 0, 0, |
| 449 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); | 449 SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE); |
| 450 #else | 450 #else |
| 451 NOTIMPLEMENTED(); | 451 NOTIMPLEMENTED(); |
| 452 #endif | 452 #endif |
| 453 } | 453 } |
| 454 | 454 |
| 455 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const { | 455 PanelBrowserFrameView* PanelBrowserView::GetFrameView() const { |
| 456 return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView()); | 456 return static_cast<PanelBrowserFrameView*>(frame()->GetFrameView()); |
| 457 } | 457 } |
| 458 | 458 |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 577 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA) | 577 #if defined(OS_WIN) && !defined(USE_ASH) && !defined(USE_AURA) |
| 578 // Live preview is only available since Windows 7. | 578 // Live preview is only available since Windows 7. |
| 579 if (base::win::GetVersion() < base::win::VERSION_WIN7) | 579 if (base::win::GetVersion() < base::win::VERSION_WIN7) |
| 580 return; | 580 return; |
| 581 | 581 |
| 582 bool is_minimized = old_state != Panel::EXPANDED; | 582 bool is_minimized = old_state != Panel::EXPANDED; |
| 583 bool will_be_minimized = new_state != Panel::EXPANDED; | 583 bool will_be_minimized = new_state != Panel::EXPANDED; |
| 584 if (is_minimized == will_be_minimized) | 584 if (is_minimized == will_be_minimized) |
| 585 return; | 585 return; |
| 586 | 586 |
| 587 HWND native_window = GetNativeHandle(); | 587 HWND native_window = GetNativeWindow(); |
| 588 | 588 |
| 589 if (!thumbnail_subclass_.get()) { | 589 if (!thumbnail_subclass_.get()) { |
| 590 thumbnail_subclass_.reset(new ui::HWNDSubclass(native_window)); | 590 thumbnail_subclass_.reset(new ui::HWNDSubclass(native_window)); |
| 591 // thumbnailer_ is owned by thumbnail_subclass_. | 591 // thumbnailer_ is owned by thumbnail_subclass_. |
| 592 thumbnailer_ = new TaskbarWindowThumbnailerWin(native_window); | 592 thumbnailer_ = new TaskbarWindowThumbnailerWin(native_window); |
| 593 thumbnail_subclass_->SetFilter(thumbnailer_); | 593 thumbnail_subclass_->SetFilter(thumbnailer_); |
| 594 } | 594 } |
| 595 | 595 |
| 596 // Cache the image at this point. | 596 // Cache the image at this point. |
| 597 if (will_be_minimized) { | 597 if (will_be_minimized) { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 699 return frame_view->close_button_->visible(); | 699 return frame_view->close_button_->visible(); |
| 700 case panel::MINIMIZE_BUTTON: | 700 case panel::MINIMIZE_BUTTON: |
| 701 return frame_view->minimize_button_->visible(); | 701 return frame_view->minimize_button_->visible(); |
| 702 case panel::RESTORE_BUTTON: | 702 case panel::RESTORE_BUTTON: |
| 703 return frame_view->restore_button_->visible(); | 703 return frame_view->restore_button_->visible(); |
| 704 default: | 704 default: |
| 705 NOTREACHED(); | 705 NOTREACHED(); |
| 706 } | 706 } |
| 707 return false; | 707 return false; |
| 708 } | 708 } |
| OLD | NEW |