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

Side by Side Diff: ui/web_dialogs/constrained_web_dialog_ui.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
« no previous file with comments | « ui/web_dialogs/constrained_web_dialog_ui.h ('k') | ui/web_dialogs/web_dialog_delegate.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 "chrome/browser/ui/webui/constrained_web_dialog_ui.h" 5 #include "ui/web_dialogs/constrained_web_dialog_ui.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/property_bag.h" 13 #include "base/property_bag.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/ui/webui/web_dialog_delegate.h"
16 #include "chrome/browser/ui/webui/web_dialog_ui.h"
17 #include "content/public/browser/notification_service.h" 15 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_ui.h" 18 #include "content/public/browser/web_ui.h"
19 #include "ui/web_dialogs/web_dialog_delegate.h"
20 #include "ui/web_dialogs/web_dialog_ui.h"
21 21
22 using content::RenderViewHost; 22 using content::RenderViewHost;
23 using content::WebContents; 23 using content::WebContents;
24 using content::WebUIMessageHandler; 24 using content::WebUIMessageHandler;
25 25
26 static base::LazyInstance<base::PropertyAccessor<ConstrainedWebDialogDelegate*> > 26 static base::LazyInstance<
27 base::PropertyAccessor<ui::ConstrainedWebDialogDelegate*> >
27 g_constrained_web_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; 28 g_constrained_web_dialog_ui_property_accessor = LAZY_INSTANCE_INITIALIZER;
28 29
30 namespace ui {
31
29 ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui) 32 ConstrainedWebDialogUI::ConstrainedWebDialogUI(content::WebUI* web_ui)
30 : WebUIController(web_ui) { 33 : WebUIController(web_ui) {
31 } 34 }
32 35
33 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() { 36 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
34 } 37 }
35 38
36 void ConstrainedWebDialogUI::RenderViewCreated( 39 void ConstrainedWebDialogUI::RenderViewCreated(
37 RenderViewHost* render_view_host) { 40 RenderViewHost* render_view_host) {
38 ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate(); 41 ConstrainedWebDialogDelegate* delegate = GetConstrainedDelegate();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 ConstrainedWebDialogDelegate** property = GetPropertyAccessor().GetProperty( 76 ConstrainedWebDialogDelegate** property = GetPropertyAccessor().GetProperty(
74 web_ui()->GetWebContents()->GetPropertyBag()); 77 web_ui()->GetWebContents()->GetPropertyBag());
75 return property ? *property : NULL; 78 return property ? *property : NULL;
76 } 79 }
77 80
78 // static 81 // static
79 base::PropertyAccessor<ConstrainedWebDialogDelegate*>& 82 base::PropertyAccessor<ConstrainedWebDialogDelegate*>&
80 ConstrainedWebDialogUI::GetPropertyAccessor() { 83 ConstrainedWebDialogUI::GetPropertyAccessor() {
81 return g_constrained_web_dialog_ui_property_accessor.Get(); 84 return g_constrained_web_dialog_ui_property_accessor.Get();
82 } 85 }
86
87 } // namespace ui
OLDNEW
« no previous file with comments | « ui/web_dialogs/constrained_web_dialog_ui.h ('k') | ui/web_dialogs/web_dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698