OLD | NEW |
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 "app/keyboard_codes.h" | |
8 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
9 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
10 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
11 #include "chrome/app/chrome_command_ids.h" | 10 #include "chrome/app/chrome_command_ids.h" |
12 #include "gfx/canvas_skia.h" | 11 #include "gfx/canvas_skia.h" |
13 #include "grit/generated_resources.h" | 12 #include "grit/generated_resources.h" |
14 #include "ui/base/animation/slide_animation.h" | 13 #include "ui/base/animation/slide_animation.h" |
| 14 #include "ui/base/keycodes/keyboard_codes.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 "app/l10n_util_win.h" | 20 #include "app/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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 FullscreenExitBubble::FullscreenExitBubble( | 140 FullscreenExitBubble::FullscreenExitBubble( |
141 views::Widget* frame, | 141 views::Widget* frame, |
142 CommandUpdater::CommandUpdaterDelegate* delegate) | 142 CommandUpdater::CommandUpdaterDelegate* delegate) |
143 : root_view_(frame->GetRootView()), | 143 : root_view_(frame->GetRootView()), |
144 delegate_(delegate), | 144 delegate_(delegate), |
145 popup_(NULL), | 145 popup_(NULL), |
146 size_animation_(new ui::SlideAnimation(this)) { | 146 size_animation_(new ui::SlideAnimation(this)) { |
147 size_animation_->Reset(1); | 147 size_animation_->Reset(1); |
148 | 148 |
149 // Create the contents view. | 149 // Create the contents view. |
150 views::Accelerator accelerator(app::VKEY_UNKNOWN, false, false, false); | 150 views::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false); |
151 bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator); | 151 bool got_accelerator = frame->GetAccelerator(IDC_FULLSCREEN, &accelerator); |
152 DCHECK(got_accelerator); | 152 DCHECK(got_accelerator); |
153 view_ = new FullscreenExitView( | 153 view_ = new FullscreenExitView( |
154 this, UTF16ToWideHack(accelerator.GetShortcutText())); | 154 this, UTF16ToWideHack(accelerator.GetShortcutText())); |
155 | 155 |
156 // Initialize the popup. | 156 // Initialize the popup. |
157 #if defined(OS_WIN) | 157 #if defined(OS_WIN) |
158 popup_ = new FullscreenExitPopup(); | 158 popup_ = new FullscreenExitPopup(); |
159 popup_->set_window_style(WS_POPUP); | 159 popup_->set_window_style(WS_POPUP); |
160 popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | | 160 popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 } |
OLD | NEW |