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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 8233029: More Aura fixes to build with chromeos==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed x11 issue. Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 30228746ca15622946009e638262fcf7de072fda..998da560bd13bf5a9462f97fe3a6bc31567cb4e0 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1433,10 +1433,15 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
// Now that the file thread exists we can record our stats.
chromeos::BootTimesLoader::Get()->RecordChromeMainStats();
+#if defined(TOOLKIT_USES_GTK)
// Read locale-specific GTK resource information.
std::string gtkrc = l10n_util::GetStringUTF8(IDS_LOCALE_GTKRC);
if (!gtkrc.empty())
gtk_rc_parse_string(gtkrc.c_str());
+#else
+ // TODO(saintlou): Need to provide an Aura equivalent.
+ NOTIMPLEMENTED();
+#endif
// Trigger prefetching of ownership status.
chromeos::OwnershipService::GetSharedInstance()->Prewarm();
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main_aura.h » ('j') | chrome/browser/chrome_browser_main_aura.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698