OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/signin/inline_login_ui.h" | 5 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" |
6 | 6 |
| 7 #include "chrome/browser/extensions/extension_web_contents_observer.h" |
7 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
9 #include "content/public/browser/web_ui.h" | 10 #include "content/public/browser/web_ui.h" |
10 #include "content/public/browser/web_ui_data_source.h" | 11 #include "content/public/browser/web_ui_data_source.h" |
11 #include "grit/browser_resources.h" | 12 #include "grit/browser_resources.h" |
12 #include "grit/chromium_strings.h" | 13 #include "grit/chromium_strings.h" |
13 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
14 #include "chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h
" | 15 #include "chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h
" |
15 #else | 16 #else |
16 #include "chrome/browser/extensions/tab_helper.h" | 17 #include "chrome/browser/extensions/tab_helper.h" |
17 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" | 18 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" |
18 #endif | 19 #endif |
19 | 20 |
20 namespace { | 21 namespace { |
21 | 22 |
22 content::WebUIDataSource* CreateWebUIDataSource() { | 23 content::WebUIDataSource* CreateWebUIDataSource() { |
23 content::WebUIDataSource* source = | 24 content::WebUIDataSource* source = |
24 content::WebUIDataSource::Create(chrome::kChromeUIChromeSigninHost); | 25 content::WebUIDataSource::Create(chrome::kChromeUIChromeSigninHost); |
| 26 source->OverrideContentSecurityPolicyFrameSrc("frame-src chrome-extension:;"); |
25 source->SetUseJsonJSFormatV2(); | 27 source->SetUseJsonJSFormatV2(); |
26 source->SetJsonPath("strings.js"); | 28 source->SetJsonPath("strings.js"); |
27 | 29 |
28 source->SetDefaultResource(IDR_INLINE_LOGIN_HTML); | 30 source->SetDefaultResource(IDR_INLINE_LOGIN_HTML); |
29 source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS); | 31 source->AddResourcePath("inline_login.css", IDR_INLINE_LOGIN_CSS); |
30 source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS); | 32 source->AddResourcePath("inline_login.js", IDR_INLINE_LOGIN_JS); |
31 | 33 |
32 source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE); | 34 source->AddLocalizedString("title", IDS_CHROME_SIGNIN_TITLE); |
33 return source; | 35 return source; |
34 }; | 36 }; |
35 | 37 |
36 } // empty namespace | 38 } // empty namespace |
37 | 39 |
38 InlineLoginUI::InlineLoginUI(content::WebUI* web_ui) | 40 InlineLoginUI::InlineLoginUI(content::WebUI* web_ui) |
39 : WebDialogUI(web_ui), | 41 : WebDialogUI(web_ui), |
40 auth_extension_(Profile::FromWebUI(web_ui)) { | 42 auth_extension_(Profile::FromWebUI(web_ui)) { |
41 Profile* profile = Profile::FromWebUI(web_ui); | 43 Profile* profile = Profile::FromWebUI(web_ui); |
42 content::WebUIDataSource::Add(profile, CreateWebUIDataSource()); | 44 content::WebUIDataSource::Add(profile, CreateWebUIDataSource()); |
43 | 45 |
44 #if defined(OS_CHROMEOS) | 46 #if defined(OS_CHROMEOS) |
45 web_ui->AddMessageHandler(new chromeos::InlineLoginHandlerChromeOS()); | 47 web_ui->AddMessageHandler(new chromeos::InlineLoginHandlerChromeOS()); |
46 #else | 48 #else |
47 web_ui->AddMessageHandler(new InlineLoginHandlerImpl()); | 49 web_ui->AddMessageHandler(new InlineLoginHandlerImpl()); |
48 // Required for intercepting extension function calls when the page is loaded | 50 // Required for intercepting extension function calls when the page is loaded |
49 // in a bubble (not a full tab, thus tab helpers are not registered | 51 // in a bubble (not a full tab, thus tab helpers are not registered |
50 // automatically). | 52 // automatically). |
51 extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents()); | 53 extensions::ExtensionWebContentsObserver::CreateForWebContents( |
| 54 web_ui->GetWebContents()); |
52 #endif | 55 #endif |
53 } | 56 } |
54 | 57 |
55 InlineLoginUI::~InlineLoginUI() {} | 58 InlineLoginUI::~InlineLoginUI() {} |
OLD | NEW |