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

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

Issue 10805047: Move WebDialogView to ui/views/controls/webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/webview/web_dialog_view.h ('k') | ui/views/views.gyp » ('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 "chrome/browser/ui/views/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"
(...skipping 12 matching lines...) Expand all
28 #include "ui/views/widget/native_widget_aura.h" 28 #include "ui/views/widget/native_widget_aura.h"
29 #endif 29 #endif
30 30
31 using content::NativeWebKeyboardEvent; 31 using content::NativeWebKeyboardEvent;
32 using content::WebContents; 32 using content::WebContents;
33 using content::WebUIMessageHandler; 33 using content::WebUIMessageHandler;
34 using ui::WebDialogDelegate; 34 using ui::WebDialogDelegate;
35 using ui::WebDialogUI; 35 using ui::WebDialogUI;
36 using ui::WebDialogWebContentsDelegate; 36 using ui::WebDialogWebContentsDelegate;
37 37
38 namespace views {
39
38 //////////////////////////////////////////////////////////////////////////////// 40 ////////////////////////////////////////////////////////////////////////////////
39 // WebDialogView, public: 41 // WebDialogView, public:
40 42
41 WebDialogView::WebDialogView( 43 WebDialogView::WebDialogView(
42 content::BrowserContext* context, 44 content::BrowserContext* context,
43 WebDialogDelegate* delegate, 45 WebDialogDelegate* delegate,
44 WebContentsHandler* handler) 46 WebContentsHandler* handler)
45 : ClientView(NULL, NULL), 47 : ClientView(NULL, NULL),
46 WebDialogWebContentsDelegate(context, handler), 48 WebDialogWebContentsDelegate(context, handler),
47 initialized_(false), 49 initialized_(false),
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 313
312 if (delegate_) { 314 if (delegate_) {
313 gfx::Size out; 315 gfx::Size out;
314 delegate_->GetDialogSize(&out); 316 delegate_->GetDialogSize(&out);
315 if (!out.IsEmpty() && GetWidget()) 317 if (!out.IsEmpty() && GetWidget())
316 GetWidget()->CenterWindow(out); 318 GetWidget()->CenterWindow(out);
317 } 319 }
318 320
319 web_view_->LoadInitialURL(GetDialogContentURL()); 321 web_view_->LoadInitialURL(GetDialogContentURL());
320 } 322 }
323
324 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/webview/web_dialog_view.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698