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

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

Issue 144983002: Fixed chrome://settings/accounts availability for MP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added browsertest. Created 6 years, 10 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
OLDNEW
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/components_ui.h" 5 #include "chrome/browser/ui/webui/components_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 14 matching lines...) Expand all
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 26
27 #if defined(OS_CHROMEOS) 27 #if defined(OS_CHROMEOS)
28 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h" 28 #include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
29 #endif 29 #endif
30 30
31 using content::WebUIMessageHandler; 31 using content::WebUIMessageHandler;
32 32
33 namespace { 33 namespace {
34 34
35 content::WebUIDataSource* CreateComponentsUIHTMLSource() { 35 content::WebUIDataSource* CreateComponentsUIHTMLSource(Profile* profile) {
36 content::WebUIDataSource* source = 36 content::WebUIDataSource* source =
37 content::WebUIDataSource::Create(chrome::kChromeUIComponentsHost); 37 content::WebUIDataSource::Create(chrome::kChromeUIComponentsHost);
38 source->SetUseJsonJSFormatV2(); 38 source->SetUseJsonJSFormatV2();
39 39
40 source->AddLocalizedString("componentsTitle", IDS_COMPONENTS_TITLE); 40 source->AddLocalizedString("componentsTitle", IDS_COMPONENTS_TITLE);
41 source->AddLocalizedString("componentsNoneInstalled", 41 source->AddLocalizedString("componentsNoneInstalled",
42 IDS_COMPONENTS_NONE_INSTALLED); 42 IDS_COMPONENTS_NONE_INSTALLED);
43 source->AddLocalizedString("componentVersion", IDS_COMPONENTS_VERSION); 43 source->AddLocalizedString("componentVersion", IDS_COMPONENTS_VERSION);
44 source->AddLocalizedString("checkUpdate", IDS_COMPONENTS_CHECK_FOR_UPDATE); 44 source->AddLocalizedString("checkUpdate", IDS_COMPONENTS_CHECK_FOR_UPDATE);
45 source->AddLocalizedString("noComponents", IDS_COMPONENTS_NO_COMPONENTS); 45 source->AddLocalizedString("noComponents", IDS_COMPONENTS_NO_COMPONENTS);
46 46
47 source->SetJsonPath("strings.js"); 47 source->SetJsonPath("strings.js");
48 source->AddResourcePath("components.js", IDR_COMPONENTS_JS); 48 source->AddResourcePath("components.js", IDR_COMPONENTS_JS);
49 source->SetDefaultResource(IDR_COMPONENTS_HTML); 49 source->SetDefaultResource(IDR_COMPONENTS_HTML);
50 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 chromeos::AddAccountUITweaksLocalizedValues(source); 51 chromeos::AddAccountUITweaksLocalizedValues(source, profile);
52 #endif 52 #endif
53 return source; 53 return source;
54 } 54 }
55 55
56 //////////////////////////////////////////////////////////////////////////////// 56 ////////////////////////////////////////////////////////////////////////////////
57 // 57 //
58 // ComponentsDOMHandler 58 // ComponentsDOMHandler
59 // 59 //
60 //////////////////////////////////////////////////////////////////////////////// 60 ////////////////////////////////////////////////////////////////////////////////
61 61
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 // 149 //
150 // ComponentsUI 150 // ComponentsUI
151 // 151 //
152 /////////////////////////////////////////////////////////////////////////////// 152 ///////////////////////////////////////////////////////////////////////////////
153 153
154 ComponentsUI::ComponentsUI(content::WebUI* web_ui) : WebUIController(web_ui) { 154 ComponentsUI::ComponentsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
155 web_ui->AddMessageHandler(new ComponentsDOMHandler()); 155 web_ui->AddMessageHandler(new ComponentsDOMHandler());
156 156
157 // Set up the chrome://components/ source. 157 // Set up the chrome://components/ source.
158 Profile* profile = Profile::FromWebUI(web_ui); 158 Profile* profile = Profile::FromWebUI(web_ui);
159 content::WebUIDataSource::Add(profile, CreateComponentsUIHTMLSource()); 159 content::WebUIDataSource::Add(profile, CreateComponentsUIHTMLSource(profile));
160 } 160 }
161 161
162 // static 162 // static
163 void ComponentsUI::OnDemandUpdate(const std::string& component_id) { 163 void ComponentsUI::OnDemandUpdate(const std::string& component_id) {
164 component_updater::ComponentUpdateService* cus = 164 component_updater::ComponentUpdateService* cus =
165 g_browser_process->component_updater(); 165 g_browser_process->component_updater();
166 cus->OnDemandUpdate(component_id); 166 cus->OnDemandUpdate(component_id);
167 } 167 }
168 168
169 // static 169 // static
170 base::RefCountedMemory* ComponentsUI::GetFaviconResourceBytes( 170 base::RefCountedMemory* ComponentsUI::GetFaviconResourceBytes(
171 ui::ScaleFactor scale_factor) { 171 ui::ScaleFactor scale_factor) {
172 return ResourceBundle::GetSharedInstance(). 172 return ResourceBundle::GetSharedInstance().
173 LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor); 173 LoadDataResourceBytesForScale(IDR_PLUGINS_FAVICON, scale_factor);
174 } 174 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698