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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real 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 | Annotate | Revision Log
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/html_dialog_view.h" 5 #include "chrome/browser/ui/views/html_dialog_view.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser_dialogs.h" 11 #include "chrome/browser/ui/browser_dialogs.h"
12 #include "chrome/browser/ui/views/window.h" 12 #include "chrome/browser/ui/views/window.h"
13 #include "content/browser/tab_contents/tab_contents.h" 13 #include "content/browser/tab_contents/tab_contents.h"
14 #include "content/public/browser/native_web_keyboard_event.h" 14 #include "content/public/browser/native_web_keyboard_event.h"
15 #include "content/public/browser/notification_details.h" 15 #include "content/public/browser/notification_details.h"
16 #include "content/public/browser/notification_source.h" 16 #include "content/public/browser/notification_source.h"
17 #include "content/public/browser/notification_types.h" 17 #include "content/public/browser/notification_types.h"
18 #include "ui/base/keycodes/keyboard_codes.h" 18 #include "ui/base/keycodes/keyboard_codes.h"
19 #include "ui/views/events/event.h" 19 #include "ui/views/events/event.h"
20 #include "views/widget/root_view.h" 20 #include "ui/views/widget/root_view.h"
21 #include "views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
22 22
23 #if defined(TOOLKIT_USES_GTK) 23 #if defined(TOOLKIT_USES_GTK)
24 #include "views/widget/native_widget_gtk.h" 24 #include "ui/views/widget/native_widget_gtk.h"
25 #endif 25 #endif
26 26
27 class RenderWidgetHost; 27 class RenderWidgetHost;
28 28
29 namespace browser { 29 namespace browser {
30 30
31 // Declared in browser_dialogs.h so that others don't need to depend on our .h. 31 // Declared in browser_dialogs.h so that others don't need to depend on our .h.
32 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent, 32 gfx::NativeWindow ShowHtmlDialog(gfx::NativeWindow parent,
33 Profile* profile, 33 Profile* profile,
34 HtmlDialogUIDelegate* delegate) { 34 HtmlDialogUIDelegate* delegate) {
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 } 267 }
268 268
269 void HtmlDialogView::OnTabMainFrameFirstRender() { 269 void HtmlDialogView::OnTabMainFrameFirstRender() {
270 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK) 270 #if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
271 if (initialized_) { 271 if (initialized_) {
272 views::NativeWidgetGtk::UpdateFreezeUpdatesProperty( 272 views::NativeWidgetGtk::UpdateFreezeUpdatesProperty(
273 GTK_WINDOW(GetWidget()->GetNativeView()), false); 273 GTK_WINDOW(GetWidget()->GetNativeView()), false);
274 } 274 }
275 #endif 275 #endif
276 } 276 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.h ('k') | chrome/browser/ui/views/html_dialog_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698