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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/fullscreen_exit_bubble.h" 5 #include "chrome/browser/ui/views/fullscreen_exit_bubble.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/app/chrome_command_ids.h" 8 #include "chrome/app/chrome_command_ids.h"
9 #include "gfx/canvas_skia.h"
10 #include "grit/generated_resources.h" 9 #include "grit/generated_resources.h"
11 #include "ui/base/animation/slide_animation.h" 10 #include "ui/base/animation/slide_animation.h"
12 #include "ui/base/keycodes/keyboard_codes.h" 11 #include "ui/base/keycodes/keyboard_codes.h"
13 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
14 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
14 #include "ui/gfx/canvas_skia.h"
15 #include "views/screen.h" 15 #include "views/screen.h"
16 #include "views/widget/root_view.h" 16 #include "views/widget/root_view.h"
17 #include "views/window/window.h" 17 #include "views/window/window.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "ui/base/l10n/l10n_util_win.h" 20 #include "ui/base/l10n/l10n_util_win.h"
21 #include "views/widget/widget_win.h" 21 #include "views/widget/widget_win.h"
22 #elif defined(OS_LINUX) 22 #elif defined(OS_LINUX)
23 #include "views/widget/widget_gtk.h" 23 #include "views/widget/widget_gtk.h"
24 #endif 24 #endif
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 } 285 }
286 // NOTE: don't use the bounds of the root_view_. On linux changing window 286 // NOTE: don't use the bounds of the root_view_. On linux changing window
287 // size is async. Instead we use the size of the screen. 287 // size is async. Instead we use the size of the screen.
288 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow( 288 gfx::Rect screen_bounds = views::Screen::GetMonitorAreaNearestWindow(
289 root_view_->GetWidget()->GetNativeView()); 289 root_view_->GetWidget()->GetNativeView());
290 gfx::Point origin(screen_bounds.x() + 290 gfx::Point origin(screen_bounds.x() +
291 (screen_bounds.width() - size.width()) / 2, 291 (screen_bounds.width() - size.width()) / 2,
292 screen_bounds.y()); 292 screen_bounds.y());
293 return gfx::Rect(origin, size); 293 return gfx::Rect(origin, size);
294 } 294 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/popup_non_client_frame_view.cc ('k') | chrome/browser/ui/views/generic_info_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698