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

Unified Diff: chrome/browser/ui/views/keyboard_overlay_dialog_view.cc

Issue 8774022: Converting BubbleWindow uses, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Doesn't build... just a checkpoint for this work, might change approach. Created 9 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/dialog_style.h ('k') | chrome/browser/ui/views/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
index a32d72566b11b0339c9c42d0aef119b4b83fdb27..e88f88c8677c851b1c9a8041332f71ed081c06b1 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
@@ -5,21 +5,17 @@
#include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/chromeos/frame/bubble_window.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/views/accelerator_table.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/keyboard_overlay_delegate.h"
-#include "chrome/browser/ui/views/window.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/native_web_keyboard_event.h"
#include "grit/generated_resources.h"
#include "ui/base/keycodes/keyboard_codes.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/views/events/event.h"
-#include "ui/views/widget/root_view.h"
-#include "ui/views/widget/widget.h"
namespace {
struct Accelerator {
@@ -93,11 +89,8 @@ void KeyboardOverlayDialogView::ShowDialog(
delegate,
parent_view);
delegate->set_view(html_view);
- html_view->InitDialog();
- chromeos::BubbleWindow::Create(owning_window,
- STYLE_FLUSH,
- html_view);
- html_view->GetWidget()->Show();
+ browser::ShowHtmlDialog(owning_window, parent_view->browser()->profile(),
+ html_view, STYLE_FLUSH);
}
bool KeyboardOverlayDialogView::IsCloseAccelerator(
« no previous file with comments | « chrome/browser/ui/dialog_style.h ('k') | chrome/browser/ui/views/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698