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/panels/panel_view.h" | 5 #include "chrome/browser/ui/views/panels/panel_view.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <map> |
| 9 #include <utility> |
8 | 10 |
9 #include <map> | |
10 #include "base/logging.h" | 11 #include "base/logging.h" |
11 #include "base/macros.h" | 12 #include "base/macros.h" |
12 #include "base/message_loop/message_loop.h" | 13 #include "base/message_loop/message_loop.h" |
13 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
14 #include "build/build_config.h" | 15 #include "build/build_config.h" |
15 #include "chrome/app/chrome_command_ids.h" | 16 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/ui/host_desktop.h" | 18 #include "chrome/browser/ui/host_desktop.h" |
18 #include "chrome/browser/ui/panels/panel.h" | 19 #include "chrome/browser/ui/panels/panel.h" |
19 #include "chrome/browser/ui/panels/panel_bounds_animation.h" | 20 #include "chrome/browser/ui/panels/panel_bounds_animation.h" |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 | 327 |
327 #if defined(USE_X11) && !defined(OS_CHROMEOS) | 328 #if defined(USE_X11) && !defined(OS_CHROMEOS) |
328 // Swap the default non client event handler with one which handles resizes | 329 // Swap the default non client event handler with one which handles resizes |
329 // for panels entirely within Chrome. This is needed because it is not | 330 // for panels entirely within Chrome. This is needed because it is not |
330 // possible to tell when a resize performed by the window manager ends. | 331 // possible to tell when a resize performed by the window manager ends. |
331 views::DesktopWindowTreeHostX11* host = | 332 views::DesktopWindowTreeHostX11* host = |
332 views::DesktopWindowTreeHostX11::GetHostForXID( | 333 views::DesktopWindowTreeHostX11::GetHostForXID( |
333 window_->GetNativeView()->GetHost()->GetAcceleratedWidget()); | 334 window_->GetNativeView()->GetHost()->GetAcceleratedWidget()); |
334 scoped_ptr<ui::EventHandler> resizer( | 335 scoped_ptr<ui::EventHandler> resizer( |
335 new X11PanelResizer(panel_.get(), window_->GetNativeWindow())); | 336 new X11PanelResizer(panel_.get(), window_->GetNativeWindow())); |
336 host->SwapNonClientEventHandler(resizer.Pass()); | 337 host->SwapNonClientEventHandler(std::move(resizer)); |
337 #endif | 338 #endif |
338 } | 339 } |
339 | 340 |
340 PanelView::~PanelView() { | 341 PanelView::~PanelView() { |
341 } | 342 } |
342 | 343 |
343 void PanelView::ShowPanel() { | 344 void PanelView::ShowPanel() { |
344 if (window_->IsVisible()) | 345 if (window_->IsVisible()) |
345 return; | 346 return; |
346 window_->Show(); | 347 window_->Show(); |
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1142 // SWP_FRAMECHANGED flag must be called in order for the cached window data | 1143 // SWP_FRAMECHANGED flag must be called in order for the cached window data |
1143 // to be updated properly. | 1144 // to be updated properly. |
1144 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).a
spx | 1145 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms633591(v=vs.85).a
spx |
1145 if (update_frame) { | 1146 if (update_frame) { |
1146 ::SetWindowPos(native_window, NULL, 0, 0, 0, 0, | 1147 ::SetWindowPos(native_window, NULL, 0, 0, 0, 0, |
1147 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | | 1148 SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | |
1148 SWP_NOZORDER | SWP_NOACTIVATE); | 1149 SWP_NOZORDER | SWP_NOACTIVATE); |
1149 } | 1150 } |
1150 } | 1151 } |
1151 #endif | 1152 #endif |
OLD | NEW |