summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/webui')
-rw-r--r--chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc4
-rw-r--r--chrome/browser/ui/webui/devtools_ui.cc4
-rw-r--r--chrome/browser/ui/webui/slideshow_ui.cc4
-rw-r--r--chrome/browser/ui/webui/sync_internals_html_source.cc2
-rw-r--r--chrome/browser/ui/webui/sync_internals_html_source.h2
-rw-r--r--chrome/browser/ui/webui/textfields_ui.cc2
-rw-r--r--chrome/browser/ui/webui/textfields_ui.h2
-rw-r--r--chrome/browser/ui/webui/theme_source.cc6
-rw-r--r--chrome/browser/ui/webui/theme_source.h2
-rw-r--r--chrome/browser/ui/webui/thumbnail_source.cc2
-rw-r--r--chrome/browser/ui/webui/thumbnail_source.h2
11 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
index 7cc5504..2a53700 100644
--- a/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/proxy_settings_ui.cc
@@ -26,7 +26,7 @@ class ProxySettingsHTMLSource : public ChromeURLDataManager::DataSource {
// Called when the network layer has requested a resource underneath
// the path we registered.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string&) const {
return "text/html";
@@ -45,7 +45,7 @@ ProxySettingsHTMLSource::ProxySettingsHTMLSource(
}
void ProxySettingsHTMLSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
SetFontAndTextDirection(localized_strings_.get());
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index 76293a8..4e9f6c4 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -28,7 +28,7 @@ class DevToolsDataSource : public ChromeURLDataManager::DataSource {
DevToolsDataSource();
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
@@ -43,7 +43,7 @@ DevToolsDataSource::DevToolsDataSource()
}
void DevToolsDataSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
std::string filename = PathWithoutParams(path);
diff --git a/chrome/browser/ui/webui/slideshow_ui.cc b/chrome/browser/ui/webui/slideshow_ui.cc
index cbb39e7..059dd6e 100644
--- a/chrome/browser/ui/webui/slideshow_ui.cc
+++ b/chrome/browser/ui/webui/slideshow_ui.cc
@@ -44,7 +44,7 @@ class SlideshowUIHTMLSource : public ChromeURLDataManager::DataSource {
// Called when the network layer has requested a resource underneath
// the path we registered.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string&) const {
return "text/html";
@@ -109,7 +109,7 @@ SlideshowUIHTMLSource::SlideshowUIHTMLSource()
}
void SlideshowUIHTMLSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
DictionaryValue localized_strings;
// TODO(dhg): Add stirings to localized strings, also add more strings
diff --git a/chrome/browser/ui/webui/sync_internals_html_source.cc b/chrome/browser/ui/webui/sync_internals_html_source.cc
index 6976811..c5c2809 100644
--- a/chrome/browser/ui/webui/sync_internals_html_source.cc
+++ b/chrome/browser/ui/webui/sync_internals_html_source.cc
@@ -23,7 +23,7 @@ SyncInternalsHTMLSource::SyncInternalsHTMLSource()
SyncInternalsHTMLSource::~SyncInternalsHTMLSource() {}
void SyncInternalsHTMLSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
base::StringPiece html_template(
ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/ui/webui/sync_internals_html_source.h b/chrome/browser/ui/webui/sync_internals_html_source.h
index 2afe5d0..6ef23ff 100644
--- a/chrome/browser/ui/webui/sync_internals_html_source.h
+++ b/chrome/browser/ui/webui/sync_internals_html_source.h
@@ -17,7 +17,7 @@ class SyncInternalsHTMLSource : public ChromeURLDataManager::DataSource {
// ChromeURLDataManager::DataSource implementation.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
diff --git a/chrome/browser/ui/webui/textfields_ui.cc b/chrome/browser/ui/webui/textfields_ui.cc
index 88a9e0d..a87f90d 100644
--- a/chrome/browser/ui/webui/textfields_ui.cc
+++ b/chrome/browser/ui/webui/textfields_ui.cc
@@ -26,7 +26,7 @@ TextfieldsUIHTMLSource::TextfieldsUIHTMLSource()
}
void TextfieldsUIHTMLSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
const std::string full_html = ResourceBundle::GetSharedInstance()
.GetRawDataResource(IDR_TEXTFIELDS_HTML).as_string();
diff --git a/chrome/browser/ui/webui/textfields_ui.h b/chrome/browser/ui/webui/textfields_ui.h
index 4ce9ef8..a9d0f31 100644
--- a/chrome/browser/ui/webui/textfields_ui.h
+++ b/chrome/browser/ui/webui/textfields_ui.h
@@ -26,7 +26,7 @@ class TextfieldsUIHTMLSource : public ChromeURLDataManager::DataSource {
// Called when the network layer has requested a resource underneath
// the path we registered.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc
index 35f6729..010b3a1 100644
--- a/chrome/browser/ui/webui/theme_source.cc
+++ b/chrome/browser/ui/webui/theme_source.cc
@@ -41,7 +41,7 @@ ThemeSource::~ThemeSource() {
}
void ThemeSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
// Our path may include cachebuster arguments, so trim them off.
std::string uncached_path = StripQueryParams(path);
@@ -49,8 +49,8 @@ void ThemeSource::StartDataRequest(const std::string& path,
if (uncached_path == kNewTabCSSPath ||
uncached_path == kNewIncognitoTabCSSPath) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
- DCHECK((uncached_path == kNewTabCSSPath && !is_off_the_record) ||
- (uncached_path == kNewIncognitoTabCSSPath && is_off_the_record));
+ DCHECK((uncached_path == kNewTabCSSPath && !is_incognito) ||
+ (uncached_path == kNewIncognitoTabCSSPath && is_incognito));
SendResponse(request_id, css_bytes_);
return;
diff --git a/chrome/browser/ui/webui/theme_source.h b/chrome/browser/ui/webui/theme_source.h
index 037bb83..c3d8207 100644
--- a/chrome/browser/ui/webui/theme_source.h
+++ b/chrome/browser/ui/webui/theme_source.h
@@ -20,7 +20,7 @@ class ThemeSource : public ChromeURLDataManager::DataSource {
// Called when the network layer has requested a resource underneath
// the path we registered.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
diff --git a/chrome/browser/ui/webui/thumbnail_source.cc b/chrome/browser/ui/webui/thumbnail_source.cc
index 3123e21..8b98a9f 100644
--- a/chrome/browser/ui/webui/thumbnail_source.cc
+++ b/chrome/browser/ui/webui/thumbnail_source.cc
@@ -22,7 +22,7 @@ ThumbnailSource::~ThumbnailSource() {
}
void ThumbnailSource::StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id) {
scoped_refptr<RefCountedBytes> data;
if (top_sites_->GetPageThumbnail(GURL(path), &data)) {
diff --git a/chrome/browser/ui/webui/thumbnail_source.h b/chrome/browser/ui/webui/thumbnail_source.h
index a759225..d9d1119 100644
--- a/chrome/browser/ui/webui/thumbnail_source.h
+++ b/chrome/browser/ui/webui/thumbnail_source.h
@@ -28,7 +28,7 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource {
// Called when the network layer has requested a resource underneath
// the path we registered.
virtual void StartDataRequest(const std::string& path,
- bool is_off_the_record,
+ bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
generated by cgit v1.1 at 2025-02-03 07:34:40 +0000