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 <map> | 7 #include <map> |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 iter != accelerator_table.end(); ++iter) { | 284 iter != accelerator_table.end(); ++iter) { |
285 focus_manager->RegisterAccelerator( | 285 focus_manager->RegisterAccelerator( |
286 iter->first, ui::AcceleratorManager::kNormalPriority, this); | 286 iter->first, ui::AcceleratorManager::kNormalPriority, this); |
287 } | 287 } |
288 | 288 |
289 #if defined(OS_WIN) | 289 #if defined(OS_WIN) |
290 ui::win::SetAppIdForWindow( | 290 ui::win::SetAppIdForWindow( |
291 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(panel->app_name()), | 291 ShellIntegration::GetAppModelIdForProfile(UTF8ToWide(panel->app_name()), |
292 panel->profile()->GetPath()), | 292 panel->profile()->GetPath()), |
293 views::HWNDForWidget(window_)); | 293 views::HWNDForWidget(window_)); |
| 294 ui::win::PreventWindowFromPinning(views::HWNDForWidget(window_)); |
294 #endif | 295 #endif |
295 } | 296 } |
296 | 297 |
297 PanelView::~PanelView() { | 298 PanelView::~PanelView() { |
298 } | 299 } |
299 | 300 |
300 void PanelView::ShowPanel() { | 301 void PanelView::ShowPanel() { |
301 ShowPanelInactive(); | 302 ShowPanelInactive(); |
302 ActivatePanel(); | 303 ActivatePanel(); |
303 } | 304 } |
(...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1138 DCHECK(thickness_for_mouse_resizing > 0); | 1139 DCHECK(thickness_for_mouse_resizing > 0); |
1139 SkRegion* region = new SkRegion; | 1140 SkRegion* region = new SkRegion; |
1140 region->op(0, 0, thickness_for_mouse_resizing, height, SkRegion::kUnion_Op); | 1141 region->op(0, 0, thickness_for_mouse_resizing, height, SkRegion::kUnion_Op); |
1141 region->op(width - thickness_for_mouse_resizing, 0, width, height, | 1142 region->op(width - thickness_for_mouse_resizing, 0, width, height, |
1142 SkRegion::kUnion_Op); | 1143 SkRegion::kUnion_Op); |
1143 region->op(0, height - thickness_for_mouse_resizing, width, height, | 1144 region->op(0, height - thickness_for_mouse_resizing, width, height, |
1144 SkRegion::kUnion_Op); | 1145 SkRegion::kUnion_Op); |
1145 web_contents->GetRenderViewHost()->GetView()->SetClickthroughRegion(region); | 1146 web_contents->GetRenderViewHost()->GetView()->SetClickthroughRegion(region); |
1146 #endif | 1147 #endif |
1147 } | 1148 } |
OLD | NEW |