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

Unified Diff: chrome/browser/dom_ui/options/options_ui.cc

Issue 5315006: chromeos: Fix DOMUI about:credits link. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: abstract out AboutSource init code from WillHandleBrowserAboutURL Created 10 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/dom_ui/options/options_ui.cc
diff --git a/chrome/browser/dom_ui/options/options_ui.cc b/chrome/browser/dom_ui/options/options_ui.cc
index 867b4fb2b69ccdf02aecf194a079aa5d22fe52ef..36014a199be6293ad5f8aba8773e9dd63159c3f3 100644
--- a/chrome/browser/dom_ui/options/options_ui.cc
+++ b/chrome/browser/dom_ui/options/options_ui.cc
@@ -17,6 +17,7 @@
#include "base/thread.h"
#include "base/time.h"
#include "base/values.h"
+#include "chrome/browser/browser_about_handler.h"
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/dom_ui/dom_ui_theme_source.h"
#include "chrome/browser/dom_ui/options/about_page_handler.h"
@@ -46,13 +47,12 @@
#include "chrome/common/notification_type.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
-#include "net/base/escape.h"
-
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
#include "grit/theme_resources.h"
+#include "net/base/escape.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h"
@@ -202,7 +202,7 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
&ChromeURLDataManager::AddDataSource,
make_scoped_refptr(html_source)));
- // Set up chrome://theme/ source.
+ // Set up the chrome://theme/ source.
DOMUIThemeSource* theme = new DOMUIThemeSource(GetProfile());
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
@@ -210,6 +210,10 @@ OptionsUI::OptionsUI(TabContents* contents) : DOMUI(contents) {
ChromeURLDataManager::GetInstance(),
&ChromeURLDataManager::AddDataSource,
make_scoped_refptr(theme)));
+
+ // Initialize the chrome://about/ source in case the user clicks the credits
+ // link.
+ InitializeAboutDataSource();
}
OptionsUI::~OptionsUI() {
« no previous file with comments | « chrome/browser/dom_ui/options/about_page_handler.cc ('k') | chrome/browser/resources/options/about_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698