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

Side by Side Diff: chrome/browser/views/fullscreen_exit_bubble.cc

Issue 2811032: Revert 50784 - Canvas refactoring part 3.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/fullscreen_exit_bubble.h" 5 #include "chrome/browser/views/fullscreen_exit_bubble.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/keyboard_codes.h" 9 #include "base/keyboard_codes.h"
10 #include "chrome/app/chrome_dll_resource.h" 10 #include "chrome/app/chrome_dll_resource.h"
11 #include "gfx/canvas_skia.h" 11 #include "gfx/canvas.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "views/screen.h" 13 #include "views/screen.h"
14 #include "views/widget/root_view.h" 14 #include "views/widget/root_view.h"
15 #include "views/window/window.h" 15 #include "views/window/window.h"
16 16
17 #if defined(OS_WIN) 17 #if defined(OS_WIN)
18 #include "app/l10n_util_win.h" 18 #include "app/l10n_util_win.h"
19 #include "views/widget/widget_win.h" 19 #include "views/widget/widget_win.h"
20 #elif defined(OS_LINUX) 20 #elif defined(OS_LINUX)
21 #include "views/widget/widget_gtk.h" 21 #include "views/widget/widget_gtk.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 rect.set(0, -padding, SkIntToScalar(width()), SkIntToScalar(height())); 85 rect.set(0, -padding, SkIntToScalar(width()), SkIntToScalar(height()));
86 SkScalar rad[8] = { 0, 0, 0, 0, padding, padding, padding, padding }; 86 SkScalar rad[8] = { 0, 0, 0, 0, padding, padding, padding, padding };
87 SkPath path; 87 SkPath path;
88 path.addRoundRect(rect, rad, SkPath::kCW_Direction); 88 path.addRoundRect(rect, rad, SkPath::kCW_Direction);
89 89
90 // Fill it black. 90 // Fill it black.
91 SkPaint paint; 91 SkPaint paint;
92 paint.setStyle(SkPaint::kFill_Style); 92 paint.setStyle(SkPaint::kFill_Style);
93 paint.setFlags(SkPaint::kAntiAlias_Flag); 93 paint.setFlags(SkPaint::kAntiAlias_Flag);
94 paint.setColor(SK_ColorBLACK); 94 paint.setColor(SK_ColorBLACK);
95 canvas->AsCanvasSkia()->drawPath(path, paint); 95 canvas->drawPath(path, paint);
96 } 96 }
97 97
98 98
99 // FullscreenExitPopup --------------------------------------------------------- 99 // FullscreenExitPopup ---------------------------------------------------------
100 100
101 #if defined(OS_WIN) 101 #if defined(OS_WIN)
102 class FullscreenExitBubble::FullscreenExitPopup : public views::WidgetWin { 102 class FullscreenExitBubble::FullscreenExitPopup : public views::WidgetWin {
103 public: 103 public:
104 FullscreenExitPopup() : views::WidgetWin() {} 104 FullscreenExitPopup() : views::WidgetWin() {}
105 virtual ~FullscreenExitPopup() {} 105 virtual ~FullscreenExitPopup() {}
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 } 275 }
276 // NOTE: don't use the bounds of the root_view_. On linux changing window 276 // NOTE: don't use the bounds of the root_view_. On linux changing window
277 // size is async. Instead we use the size of the screen. 277 // size is async. Instead we use the size of the screen.
278 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow( 278 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow(
279 root_view_->GetWidget()->GetNativeView()); 279 root_view_->GetWidget()->GetNativeView());
280 gfx::Point origin(screen_bounds.x() + 280 gfx::Point origin(screen_bounds.x() +
281 (screen_bounds.width() - size.width()) / 2, 281 (screen_bounds.width() - size.width()) / 2,
282 screen_bounds.y()); 282 screen_bounds.y());
283 return gfx::Rect(origin, size); 283 return gfx::Rect(origin, size);
284 } 284 }
OLDNEW
« no previous file with comments | « chrome/browser/views/frame/opaque_browser_frame_view.cc ('k') | chrome/browser/views/info_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698