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

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

Issue 1228263002: Fix downloads-related web_dev_style presubmit issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dl-rough-draft2
Patch Set: Created 5 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
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/downloads_ui.h" 5 #include "chrome/browser/ui/webui/downloads_ui.h"
6 6
7 #include "base/memory/ref_counted_memory.h" 7 #include "base/memory/ref_counted_memory.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_piece.h" 10 #include "base/strings/string_piece.h"
(...skipping 23 matching lines...) Expand all
34 using content::DownloadManager; 34 using content::DownloadManager;
35 using content::WebContents; 35 using content::WebContents;
36 36
37 namespace { 37 namespace {
38 38
39 content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) { 39 content::WebUIDataSource* CreateDownloadsUIHTMLSource(Profile* profile) {
40 content::WebUIDataSource* source = 40 content::WebUIDataSource* source =
41 content::WebUIDataSource::Create(chrome::kChromeUIDownloadsHost); 41 content::WebUIDataSource::Create(chrome::kChromeUIDownloadsHost);
42 42
43 source->AddLocalizedString("title", IDS_DOWNLOAD_TITLE); 43 source->AddLocalizedString("title", IDS_DOWNLOAD_TITLE);
44 source->AddLocalizedString("searchbutton", IDS_DOWNLOAD_SEARCH_BUTTON); 44 source->AddLocalizedString("searchButton", IDS_DOWNLOAD_SEARCH_BUTTON);
45 source->AddLocalizedString("searchresultsfor", IDS_DOWNLOAD_SEARCHRESULTSFOR); 45 source->AddLocalizedString("searchResultsFor", IDS_DOWNLOAD_SEARCHRESULTSFOR);
46 source->AddLocalizedString("downloads", IDS_DOWNLOAD_TITLE); 46 source->AddLocalizedString("downloads", IDS_DOWNLOAD_TITLE);
47 source->AddLocalizedString("clear_all", IDS_DOWNLOAD_LINK_CLEAR_ALL); 47 source->AddLocalizedString("clearAll", IDS_DOWNLOAD_LINK_CLEAR_ALL);
48 source->AddLocalizedString("open_downloads_folder", 48 source->AddLocalizedString("openDownloadsFolder",
49 IDS_DOWNLOAD_LINK_OPEN_DOWNLOADS_FOLDER); 49 IDS_DOWNLOAD_LINK_OPEN_DOWNLOADS_FOLDER);
50 50
51 // No results/downloads messages that show instead of the downloads list. 51 // No results/downloads messages that show instead of the downloads list.
52 source->AddLocalizedString("no_downloads", IDS_DOWNLOAD_NO_DOWNLOADS); 52 source->AddLocalizedString("noDownloads", IDS_DOWNLOAD_NO_DOWNLOADS);
53 source->AddLocalizedString("no_search_results", 53 source->AddLocalizedString("noSearchResults",
54 IDS_DOWNLOAD_NO_SEARCH_RESULTS); 54 IDS_DOWNLOAD_NO_SEARCH_RESULTS);
55 55
56 // Status. 56 // Status.
57 source->AddLocalizedString("status_cancelled", IDS_DOWNLOAD_TAB_CANCELLED); 57 source->AddLocalizedString("statusCancelled", IDS_DOWNLOAD_TAB_CANCELLED);
58 source->AddLocalizedString("status_removed", IDS_DOWNLOAD_FILE_REMOVED); 58 source->AddLocalizedString("statusRemoved", IDS_DOWNLOAD_FILE_REMOVED);
59 59
60 // Dangerous file. 60 // Dangerous file.
61 source->AddLocalizedString("danger_file_desc", IDS_PROMPT_DANGEROUS_DOWNLOAD); 61 source->AddLocalizedString("dangerFileDesc", IDS_PROMPT_DANGEROUS_DOWNLOAD);
62 source->AddLocalizedString("danger_url_desc", 62 source->AddLocalizedString("dangerUrlDesc",
63 IDS_PROMPT_MALICIOUS_DOWNLOAD_URL); 63 IDS_PROMPT_MALICIOUS_DOWNLOAD_URL);
64 source->AddLocalizedString("danger_content_desc", 64 source->AddLocalizedString("dangerContentDesc",
65 IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT); 65 IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT);
66 source->AddLocalizedString("danger_uncommon_desc", 66 source->AddLocalizedString("dangerUncommonDesc",
67 IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT); 67 IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT);
68 source->AddLocalizedString("danger_settings_desc", 68 source->AddLocalizedString("dangerSettingsDesc",
69 IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS); 69 IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS);
70 source->AddLocalizedString("danger_save", IDS_CONFIRM_DOWNLOAD); 70 source->AddLocalizedString("dangerSave", IDS_CONFIRM_DOWNLOAD);
71 source->AddLocalizedString("danger_restore", IDS_CONFIRM_DOWNLOAD_RESTORE); 71 source->AddLocalizedString("dangerRestore", IDS_CONFIRM_DOWNLOAD_RESTORE);
72 source->AddLocalizedString("danger_discard", IDS_DISCARD_DOWNLOAD); 72 source->AddLocalizedString("dangerDiscard", IDS_DISCARD_DOWNLOAD);
73 73
74 // Controls. 74 // Controls.
75 source->AddLocalizedString("control_pause", IDS_DOWNLOAD_LINK_PAUSE); 75 source->AddLocalizedString("controlPause", IDS_DOWNLOAD_LINK_PAUSE);
76 if (browser_defaults::kDownloadPageHasShowInFolder) { 76 if (browser_defaults::kDownloadPageHasShowInFolder)
77 source->AddLocalizedString("control_showinfolder", IDS_DOWNLOAD_LINK_SHOW); 77 source->AddLocalizedString("controlShowInFolder", IDS_DOWNLOAD_LINK_SHOW);
78 } 78 source->AddLocalizedString("controlRetry", IDS_DOWNLOAD_LINK_RETRY);
79 source->AddLocalizedString("control_retry", IDS_DOWNLOAD_LINK_RETRY); 79 source->AddLocalizedString("controlCancel", IDS_DOWNLOAD_LINK_CANCEL);
80 source->AddLocalizedString("control_cancel", IDS_DOWNLOAD_LINK_CANCEL); 80 source->AddLocalizedString("controlResume", IDS_DOWNLOAD_LINK_RESUME);
81 source->AddLocalizedString("control_resume", IDS_DOWNLOAD_LINK_RESUME); 81 source->AddLocalizedString("controlRemoveFromList",
82 source->AddLocalizedString("control_removefromlist",
83 IDS_DOWNLOAD_LINK_REMOVE); 82 IDS_DOWNLOAD_LINK_REMOVE);
84 source->AddLocalizedString("control_by_extension", 83 source->AddLocalizedString("controlByExtension",
85 IDS_DOWNLOAD_BY_EXTENSION); 84 IDS_DOWNLOAD_BY_EXTENSION);
86 85
87 PrefService* prefs = profile->GetPrefs(); 86 PrefService* prefs = profile->GetPrefs();
88 source->AddBoolean("allow_deleting_history", 87 source->AddBoolean("allowDeletingHistory",
89 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory) && 88 prefs->GetBoolean(prefs::kAllowDeletingBrowserHistory) &&
90 !profile->IsSupervised()); 89 !profile->IsSupervised());
91 90
92 source->SetJsonPath("strings.js"); 91 source->SetJsonPath("strings.js");
93 source->AddResourcePath("constants.html", IDR_DOWNLOADS_CONSTANTS_HTML); 92 source->AddResourcePath("constants.html", IDR_DOWNLOADS_CONSTANTS_HTML);
94 source->AddResourcePath("constants.js", IDR_DOWNLOADS_CONSTANTS_JS); 93 source->AddResourcePath("constants.js", IDR_DOWNLOADS_CONSTANTS_JS);
95 source->AddResourcePath("throttled_icon_loader.html", 94 source->AddResourcePath("throttled_icon_loader.html",
96 IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML); 95 IDR_DOWNLOADS_THROTTLED_ICON_LOADER_HTML);
97 source->AddResourcePath("throttled_icon_loader.js", 96 source->AddResourcePath("throttled_icon_loader.js",
98 IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS); 97 IDR_DOWNLOADS_THROTTLED_ICON_LOADER_JS);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 content::URLDataSource::Add(profile, theme); 137 content::URLDataSource::Add(profile, theme);
139 #endif 138 #endif
140 } 139 }
141 140
142 // static 141 // static
143 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes( 142 base::RefCountedMemory* DownloadsUI::GetFaviconResourceBytes(
144 ui::ScaleFactor scale_factor) { 143 ui::ScaleFactor scale_factor) {
145 return ResourceBundle::GetSharedInstance(). 144 return ResourceBundle::GetSharedInstance().
146 LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor); 145 LoadDataResourceBytesForScale(IDR_DOWNLOADS_FAVICON, scale_factor);
147 } 146 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/md_downloads/manager.js ('k') | chrome/browser/ui/webui/downloads_ui_browsertest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698