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

Side by Side Diff: ui/views/controls/webview/web_dialog_view.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « ui/views/controls/tree/tree_view_win.cc ('k') | ui/views/events/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/views/controls/webview/web_dialog_view.h" 5 #include "ui/views/controls/webview/web_dialog_view.h"
6 6
7 #include <vector> 7 #include <vector>
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 "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
12 #include "content/public/browser/native_web_keyboard_event.h" 12 #include "content/public/browser/native_web_keyboard_event.h"
13 #include "content/public/browser/notification_details.h" 13 #include "content/public/browser/notification_details.h"
14 #include "content/public/browser/notification_source.h" 14 #include "content/public/browser/notification_source.h"
15 #include "content/public/browser/notification_types.h" 15 #include "content/public/browser/notification_types.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "ui/base/keycodes/keyboard_codes.h" 17 #include "ui/base/keycodes/keyboard_codes.h"
18 #include "ui/views/controls/webview/webview.h" 18 #include "ui/views/controls/webview/webview.h"
19 #include "ui/views/events/event.h"
20 #include "ui/views/layout/fill_layout.h" 19 #include "ui/views/layout/fill_layout.h"
21 #include "ui/views/widget/root_view.h" 20 #include "ui/views/widget/root_view.h"
22 #include "ui/views/widget/widget.h" 21 #include "ui/views/widget/widget.h"
23 #include "ui/web_dialogs/web_dialog_delegate.h" 22 #include "ui/web_dialogs/web_dialog_delegate.h"
24 #include "ui/web_dialogs/web_dialog_ui.h" 23 #include "ui/web_dialogs/web_dialog_ui.h"
25 24
26 #if defined(USE_AURA) 25 #if defined(USE_AURA)
27 #include "ui/base/event.h" 26 #include "ui/base/event.h"
28 #include "ui/views/widget/native_widget_aura.h" 27 #include "ui/views/widget/native_widget_aura.h"
29 #endif 28 #endif
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 gfx::Size out; 315 gfx::Size out;
317 delegate_->GetDialogSize(&out); 316 delegate_->GetDialogSize(&out);
318 if (!out.IsEmpty() && GetWidget()) 317 if (!out.IsEmpty() && GetWidget())
319 GetWidget()->CenterWindow(out); 318 GetWidget()->CenterWindow(out);
320 } 319 }
321 320
322 web_view_->LoadInitialURL(GetDialogContentURL()); 321 web_view_->LoadInitialURL(GetDialogContentURL());
323 } 322 }
324 323
325 } // namespace views 324 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/tree/tree_view_win.cc ('k') | ui/views/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698