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/extensions/shell_window.h" | 5 #include "chrome/browser/ui/extensions/shell_window.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.h" |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 base::Bind(&ResourceDispatcherHost::BlockRequestsForRoute, | 83 base::Bind(&ResourceDispatcherHost::BlockRequestsForRoute, |
84 base::Unretained(ResourceDispatcherHost::Get()), | 84 base::Unretained(ResourceDispatcherHost::Get()), |
85 rvh->GetProcess()->GetID(), rvh->GetRoutingID())); | 85 rvh->GetProcess()->GetID(), rvh->GetRoutingID())); |
86 } | 86 } |
87 | 87 |
88 } // namespace | 88 } // namespace |
89 | 89 |
90 ShellWindow::CreateParams::CreateParams() | 90 ShellWindow::CreateParams::CreateParams() |
91 : window_type(ShellWindow::WINDOW_TYPE_DEFAULT), | 91 : window_type(ShellWindow::WINDOW_TYPE_DEFAULT), |
92 frame(ShellWindow::FRAME_CHROME), | 92 frame(ShellWindow::FRAME_CHROME), |
| 93 transparent_background(false), |
93 bounds(INT_MIN, INT_MIN, 0, 0), | 94 bounds(INT_MIN, INT_MIN, 0, 0), |
94 creator_process_id(0), hidden(false) { | 95 creator_process_id(0), hidden(false) { |
95 } | 96 } |
96 | 97 |
97 ShellWindow::CreateParams::~CreateParams() { | 98 ShellWindow::CreateParams::~CreateParams() { |
98 } | 99 } |
99 | 100 |
100 ShellWindow* ShellWindow::Create(Profile* profile, | 101 ShellWindow* ShellWindow::Create(Profile* profile, |
101 const extensions::Extension* extension, | 102 const extensions::Extension* extension, |
102 const GURL& url, | 103 const GURL& url, |
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 const extensions::DraggableRegion& region = *iter; | 629 const extensions::DraggableRegion& region = *iter; |
629 sk_region->op( | 630 sk_region->op( |
630 region.bounds.x(), | 631 region.bounds.x(), |
631 region.bounds.y(), | 632 region.bounds.y(), |
632 region.bounds.right(), | 633 region.bounds.right(), |
633 region.bounds.bottom(), | 634 region.bounds.bottom(), |
634 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 635 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
635 } | 636 } |
636 return sk_region; | 637 return sk_region; |
637 } | 638 } |
OLD | NEW |