Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: chrome/browser/ui/views/tabs/dragged_tab_view.cc

Issue 7015051: Re-land: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tabs/dragged_tab_view.h" 5 #include "chrome/browser/ui/views/tabs/dragged_tab_view.h"
6 6
7 #include "base/stl_util-inl.h" 7 #include "base/stl_util-inl.h"
8 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h" 8 #include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
9 #include "third_party/skia/include/core/SkShader.h" 9 #include "third_party/skia/include/core/SkShader.h"
10 #include "ui/gfx/canvas_skia.h" 10 #include "ui/gfx/canvas_skia.h"
(...skipping 21 matching lines...) Expand all
32 const gfx::Size& contents_size, 32 const gfx::Size& contents_size,
33 NativeViewPhotobooth* photobooth) 33 NativeViewPhotobooth* photobooth)
34 : renderers_(renderers), 34 : renderers_(renderers),
35 renderer_bounds_(renderer_bounds), 35 renderer_bounds_(renderer_bounds),
36 show_contents_on_drag_(true), 36 show_contents_on_drag_(true),
37 mouse_tab_offset_(mouse_tab_offset), 37 mouse_tab_offset_(mouse_tab_offset),
38 photobooth_(photobooth), 38 photobooth_(photobooth),
39 contents_size_(contents_size) { 39 contents_size_(contents_size) {
40 set_parent_owned(false); 40 set_parent_owned(false);
41 41
42 container_.reset(views::Widget::CreateWidget()); 42 container_.reset(new views::Widget);
43 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
44 params.transparent = true;
45 params.keep_on_top = true;
46 params.delete_on_destroy = false;
47 params.bounds = gfx::Rect(PreferredContainerSize());
48 container_->Init(params);
49 container_->SetContentsView(this);
43 #if defined(OS_WIN) 50 #if defined(OS_WIN)
44 static_cast<views::WidgetWin*>(container_.get())-> 51 static_cast<views::WidgetWin*>(container_->native_widget())->
45 set_can_update_layered_window(false); 52 set_can_update_layered_window(false);
46 53
47 BOOL drag; 54 BOOL drag;
48 if ((::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &drag, 0) != 0) && 55 if ((::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &drag, 0) != 0) &&
49 (drag == FALSE)) { 56 (drag == FALSE)) {
50 show_contents_on_drag_ = false; 57 show_contents_on_drag_ = false;
51 } 58 }
52 #endif 59 #endif
53 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
54 params.transparent = true;
55 params.keep_on_top = true;
56 params.delete_on_destroy = false;
57 params.bounds = gfx::Rect(PreferredContainerSize());
58 container_->Init(params);
59 container_->SetContentsView(this);
60 container_->SetOpacity(kTransparentAlpha); 60 container_->SetOpacity(kTransparentAlpha);
61 container_->SetBounds(gfx::Rect(gfx::Point(), params.bounds.size())); 61 container_->SetBounds(gfx::Rect(gfx::Point(), params.bounds.size()));
62 } 62 }
63 63
64 DraggedTabView::~DraggedTabView() { 64 DraggedTabView::~DraggedTabView() {
65 parent()->RemoveChildView(this); 65 parent()->RemoveChildView(this);
66 container_->CloseNow(); 66 container_->CloseNow();
67 STLDeleteElements(&renderers_); 67 STLDeleteElements(&renderers_);
68 } 68 }
69 69
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 187 }
188 188
189 gfx::Size DraggedTabView::PreferredContainerSize() { 189 gfx::Size DraggedTabView::PreferredContainerSize() {
190 gfx::Size ps = GetPreferredSize(); 190 gfx::Size ps = GetPreferredSize();
191 return gfx::Size(ScaleValue(ps.width()), ScaleValue(ps.height())); 191 return gfx::Size(ScaleValue(ps.width()), ScaleValue(ps.height()));
192 } 192 }
193 193
194 int DraggedTabView::ScaleValue(int value) { 194 int DraggedTabView::ScaleValue(int value) {
195 return static_cast<int>(value * kScalingFactor); 195 return static_cast<int>(value * kScalingFactor);
196 } 196 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/dragged_tab_controller.cc ('k') | chrome/browser/ui/views/tabs/native_view_photobooth_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698