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

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

Issue 10171006: Convert more users away from DOMView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/keyboard_overlay_dialog_view.h" 5 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 8 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
9 #include "chrome/browser/ui/browser_dialogs.h" 9 #include "chrome/browser/ui/browser_dialogs.h"
10 #include "chrome/browser/ui/views/accelerator_table.h" 10 #include "chrome/browser/ui/views/accelerator_table.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 // Temporarily disable Shift+Alt. crosbug.com/17208. 85 // Temporarily disable Shift+Alt. crosbug.com/17208.
86 chromeos::input_method::InputMethodManager::GetInstance()->DisableHotkeys(); 86 chromeos::input_method::InputMethodManager::GetInstance()->DisableHotkeys();
87 87
88 KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate( 88 KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate(
89 l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE)); 89 l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE));
90 KeyboardOverlayDialogView* html_view = 90 KeyboardOverlayDialogView* html_view =
91 new KeyboardOverlayDialogView(parent_view->browser()->profile(), 91 new KeyboardOverlayDialogView(parent_view->browser()->profile(),
92 delegate, 92 delegate,
93 parent_view); 93 parent_view);
94 delegate->set_view(html_view); 94 delegate->set_view(html_view);
95 html_view->InitDialog();
96 browser::CreateFramelessViewsWindow(owning_window, html_view); 95 browser::CreateFramelessViewsWindow(owning_window, html_view);
97 // Show the widget at the bottom of the work area. 96 // Show the widget at the bottom of the work area.
98 gfx::Size size; 97 gfx::Size size;
99 delegate->GetDialogSize(&size); 98 delegate->GetDialogSize(&size);
100 gfx::Rect rect = gfx::Screen::GetMonitorWorkAreaNearestWindow( 99 gfx::Rect rect = gfx::Screen::GetMonitorWorkAreaNearestWindow(
101 html_view->native_view()); 100 html_view->GetWidget()->GetNativeView());
102 gfx::Rect bounds((rect.width() - size.width()) / 2, 101 gfx::Rect bounds((rect.width() - size.width()) / 2,
103 rect.height() - size.height(), 102 rect.height() - size.height(),
104 size.width(), 103 size.width(),
105 size.height()); 104 size.height());
106 html_view->GetWidget()->SetBounds(bounds); 105 html_view->GetWidget()->SetBounds(bounds);
107 html_view->GetWidget()->Show(); 106 html_view->GetWidget()->Show();
108 } 107 }
109 108
110 bool KeyboardOverlayDialogView::IsCloseAccelerator( 109 bool KeyboardOverlayDialogView::IsCloseAccelerator(
111 const ui::Accelerator& accelerator) { 110 const ui::Accelerator& accelerator) {
112 return close_accelerators_.find(accelerator) != close_accelerators_.end(); 111 return close_accelerators_.find(accelerator) != close_accelerators_.end();
113 } 112 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698