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

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

Issue 8469006: Promote bubble_window_style to more general dialog_style. (Closed) Base URL: /usr/local/google/home/bshe/NoTouchChromium/../TouchChromium/src/@trunk
Patch Set: Change base url and merge trunk. Created 9 years, 1 month 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
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/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/frame/bubble_window.h" 8 #include "chrome/browser/chromeos/frame/bubble_window.h"
9 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 9 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
10 #include "chrome/browser/ui/browser_dialogs.h" 10 #include "chrome/browser/ui/browser_dialogs.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 88
89 KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate( 89 KeyboardOverlayDelegate* delegate = new KeyboardOverlayDelegate(
90 UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE))); 90 UTF16ToWide(l10n_util::GetStringUTF16(IDS_KEYBOARD_OVERLAY_TITLE)));
91 KeyboardOverlayDialogView* html_view = 91 KeyboardOverlayDialogView* html_view =
92 new KeyboardOverlayDialogView(parent_view->browser()->profile(), 92 new KeyboardOverlayDialogView(parent_view->browser()->profile(),
93 delegate, 93 delegate,
94 parent_view); 94 parent_view);
95 delegate->set_view(html_view); 95 delegate->set_view(html_view);
96 html_view->InitDialog(); 96 html_view->InitDialog();
97 chromeos::BubbleWindow::Create(owning_window, 97 chromeos::BubbleWindow::Create(owning_window,
98 chromeos::STYLE_FLUSH, 98 STYLE_FLUSH,
99 html_view); 99 html_view);
100 html_view->GetWidget()->Show(); 100 html_view->GetWidget()->Show();
101 } 101 }
102 102
103 bool KeyboardOverlayDialogView::IsCloseAccelerator( 103 bool KeyboardOverlayDialogView::IsCloseAccelerator(
104 const ui::Accelerator& accelerator) { 104 const ui::Accelerator& accelerator) {
105 return close_accelerators_.find(accelerator) != close_accelerators_.end(); 105 return close_accelerators_.find(accelerator) != close_accelerators_.end();
106 } 106 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_dialog.cc ('k') | chrome/browser/ui/views/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698