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

Side by Side Diff: chrome/browser/ui/gtk/web_dialog_gtk.cc

Issue 10448066: Move the web dialogs code to src/ui/web_dialogs from src/chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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/gtk/web_dialog_gtk.h" 5 #include "chrome/browser/ui/gtk/web_dialog_gtk.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/property_bag.h" 9 #include "base/property_bag.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_dialogs.h" 13 #include "chrome/browser/ui/browser_dialogs.h"
14 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
15 #include "chrome/browser/ui/gtk/gtk_util.h" 15 #include "chrome/browser/ui/gtk/gtk_util.h"
16 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h" 16 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 17 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
18 #include "chrome/browser/ui/webui/web_dialog_controller.h" 18 #include "chrome/browser/ui/webui/web_dialog_controller.h"
19 #include "chrome/browser/ui/webui/web_dialog_ui.h"
20 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/native_web_keyboard_event.h" 19 #include "content/public/browser/native_web_keyboard_event.h"
22 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
21 #include "ui/web_dialogs/web_dialog_ui.h"
23 22
24 using content::NativeWebKeyboardEvent; 23 using content::NativeWebKeyboardEvent;
25 using content::WebContents; 24 using content::WebContents;
26 using content::WebUIMessageHandler; 25 using content::WebUIMessageHandler;
26 using ui::WebDialogDelegate;
27 using ui::WebDialogUI;
27 28
28 namespace browser { 29 namespace browser {
29 30
30 gfx::NativeWindow ShowWebDialog(gfx::NativeWindow parent, 31 gfx::NativeWindow ShowWebDialog(gfx::NativeWindow parent,
31 Profile* profile, 32 Profile* profile,
32 Browser* browser, 33 Browser* browser,
33 WebDialogDelegate* delegate) { 34 WebDialogDelegate* delegate) {
34 WebDialogGtk* web_dialog = 35 WebDialogGtk* web_dialog =
35 new WebDialogGtk(profile, browser, delegate, parent); 36 new WebDialogGtk(profile, browser, delegate, parent);
36 return web_dialog->InitDialog(); 37 return web_dialog->InitDialog();
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 } 261 }
261 262
262 gtk_widget_show_all(dialog_); 263 gtk_widget_show_all(dialog_);
263 264
264 return GTK_WINDOW(dialog_); 265 return GTK_WINDOW(dialog_);
265 } 266 }
266 267
267 void WebDialogGtk::OnResponse(GtkWidget* dialog, int response_id) { 268 void WebDialogGtk::OnResponse(GtkWidget* dialog, int response_id) {
268 OnDialogClosed(std::string()); 269 OnDialogClosed(std::string());
269 } 270 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/web_dialog_gtk.h ('k') | chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698