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

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

Issue 140023: Reverting 18872. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/views/tabs/dragged_tab_view.h" 5 #include "chrome/browser/views/tabs/dragged_tab_view.h"
6 6
7 #include "app/gfx/canvas.h" 7 #include "app/gfx/canvas.h"
8 #include "chrome/browser/tab_contents/tab_contents.h" 8 #include "chrome/browser/tab_contents/tab_contents.h"
9 #include "chrome/browser/tabs/tab_strip_model.h" 9 #include "chrome/browser/tabs/tab_strip_model.h"
10 #include "chrome/browser/views/tabs/native_view_photobooth.h" 10 #include "chrome/browser/views/tabs/native_view_photobooth.h"
(...skipping 30 matching lines...) Expand all
41 41
42 renderer_->UpdateData(datasource, false); 42 renderer_->UpdateData(datasource, false);
43 43
44 #if defined(OS_WIN) 44 #if defined(OS_WIN)
45 container_.reset(new views::WidgetWin); 45 container_.reset(new views::WidgetWin);
46 container_->set_delete_on_destroy(false); 46 container_->set_delete_on_destroy(false);
47 container_->set_window_style(WS_POPUP); 47 container_->set_window_style(WS_POPUP);
48 container_->set_window_ex_style( 48 container_->set_window_ex_style(
49 WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_TOOLWINDOW); 49 WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_TOOLWINDOW);
50 container_->set_can_update_layered_window(false); 50 container_->set_can_update_layered_window(false);
51 container_->Init(NULL, gfx::Rect(0, 0, 0, 0)); 51 container_->Init(NULL, gfx::Rect(0, 0, 0, 0), false);
52 container_->SetContentsView(this); 52 container_->SetContentsView(this);
53 53
54 BOOL drag; 54 BOOL drag;
55 if ((::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &drag, 0) != 0) && 55 if ((::SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &drag, 0) != 0) &&
56 (drag == FALSE)) { 56 (drag == FALSE)) {
57 show_contents_on_drag_ = false; 57 show_contents_on_drag_ = false;
58 } 58 }
59 #else 59 #else
60 NOTIMPLEMENTED(); 60 NOTIMPLEMENTED();
61 #endif 61 #endif
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 ScaleValue(ps.width()), ScaleValue(ps.height()), 284 ScaleValue(ps.width()), ScaleValue(ps.height()),
285 SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); 285 SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
286 #else 286 #else
287 NOTIMPLEMENTED(); 287 NOTIMPLEMENTED();
288 #endif 288 #endif
289 } 289 }
290 290
291 int DraggedTabView::ScaleValue(int value) { 291 int DraggedTabView::ScaleValue(int value) {
292 return attached_ ? value : static_cast<int>(value * kScalingFactor); 292 return attached_ ? value : static_cast<int>(value * kScalingFactor);
293 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/views/tabs/dragged_tab_controller.cc ('k') | chrome/browser/views/tabs/native_view_photobooth_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698