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

Side by Side Diff: chrome/browser/ui/webui/constrained_html_ui.cc

Issue 9600036: Move Render(View|Widget)Host and associated classes to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to review comments. Created 8 years, 9 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 | « chrome/browser/ui/webui/constrained_html_ui.h ('k') | chrome/browser/ui/webui/devtools_ui.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) 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/webui/constrained_html_ui.h" 5 #include "chrome/browser/ui/webui/constrained_html_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/html_dialog_ui.h" 15 #include "chrome/browser/ui/webui/html_dialog_ui.h"
16 #include "chrome/common/chrome_notification_types.h" 16 #include "chrome/common/chrome_notification_types.h"
17 #include "content/public/browser/notification_service.h" 17 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
21 21
22 using content::RenderViewHost;
22 using content::WebContents; 23 using content::WebContents;
23 using content::WebUIMessageHandler; 24 using content::WebUIMessageHandler;
24 25
25 static base::LazyInstance<base::PropertyAccessor<ConstrainedHtmlUIDelegate*> > 26 static base::LazyInstance<base::PropertyAccessor<ConstrainedHtmlUIDelegate*> >
26 g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER; 27 g_constrained_html_ui_property_accessor = LAZY_INSTANCE_INITIALIZER;
27 28
28 ConstrainedHtmlUI::ConstrainedHtmlUI(content::WebUI* web_ui) 29 ConstrainedHtmlUI::ConstrainedHtmlUI(content::WebUI* web_ui)
29 : WebUIController(web_ui) { 30 : WebUIController(web_ui) {
30 } 31 }
31 32
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 ConstrainedHtmlUIDelegate** property = GetPropertyAccessor().GetProperty( 75 ConstrainedHtmlUIDelegate** property = GetPropertyAccessor().GetProperty(
75 web_ui()->GetWebContents()->GetPropertyBag()); 76 web_ui()->GetWebContents()->GetPropertyBag());
76 return property ? *property : NULL; 77 return property ? *property : NULL;
77 } 78 }
78 79
79 // static 80 // static
80 base::PropertyAccessor<ConstrainedHtmlUIDelegate*>& 81 base::PropertyAccessor<ConstrainedHtmlUIDelegate*>&
81 ConstrainedHtmlUI::GetPropertyAccessor() { 82 ConstrainedHtmlUI::GetPropertyAccessor() {
82 return g_constrained_html_ui_property_accessor.Get(); 83 return g_constrained_html_ui_property_accessor.Get();
83 } 84 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/constrained_html_ui.h ('k') | chrome/browser/ui/webui/devtools_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698