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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1415 matching lines...) Expand 10 before | Expand all | Expand 10 after
1426 // any callbacks, I just want to initialize the mechanism.) 1426 // any callbacks, I just want to initialize the mechanism.)
1427 SecKeychainAddCallback(&KeychainCallback, 0, NULL); 1427 SecKeychainAddCallback(&KeychainCallback, 0, NULL);
1428 #endif 1428 #endif
1429 1429
1430 CreateChildThreads(browser_process_.get()); 1430 CreateChildThreads(browser_process_.get());
1431 1431
1432 #if defined(OS_CHROMEOS) 1432 #if defined(OS_CHROMEOS)
1433 // Now that the file thread exists we can record our stats. 1433 // Now that the file thread exists we can record our stats.
1434 chromeos::BootTimesLoader::Get()->RecordChromeMainStats(); 1434 chromeos::BootTimesLoader::Get()->RecordChromeMainStats();
1435 1435
1436 #if defined(TOOLKIT_USES_GTK)
1436 // Read locale-specific GTK resource information. 1437 // Read locale-specific GTK resource information.
1437 std::string gtkrc = l10n_util::GetStringUTF8(IDS_LOCALE_GTKRC); 1438 std::string gtkrc = l10n_util::GetStringUTF8(IDS_LOCALE_GTKRC);
1438 if (!gtkrc.empty()) 1439 if (!gtkrc.empty())
1439 gtk_rc_parse_string(gtkrc.c_str()); 1440 gtk_rc_parse_string(gtkrc.c_str());
1441 #else
1442 // TODO(saintlou): Need to provide an Aura equivalent.
1443 NOTIMPLEMENTED();
1444 #endif
1440 1445
1441 // Trigger prefetching of ownership status. 1446 // Trigger prefetching of ownership status.
1442 chromeos::OwnershipService::GetSharedInstance()->Prewarm(); 1447 chromeos::OwnershipService::GetSharedInstance()->Prewarm();
1443 #endif 1448 #endif
1444 1449
1445 // Record last shutdown time into a histogram. 1450 // Record last shutdown time into a histogram.
1446 browser_shutdown::ReadLastShutdownInfo(); 1451 browser_shutdown::ReadLastShutdownInfo();
1447 1452
1448 #if defined(OS_WIN) 1453 #if defined(OS_WIN)
1449 // On Windows, we use our startup as an opportunity to do upgrade/uninstall 1454 // On Windows, we use our startup as an opportunity to do upgrade/uninstall
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2087 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && 2092 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) &&
2088 (pre_read == "0" || pre_read == "1")) { 2093 (pre_read == "0" || pre_read == "1")) {
2089 std::string uma_name(name); 2094 std::string uma_name(name);
2090 uma_name += "_PreRead"; 2095 uma_name += "_PreRead";
2091 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; 2096 uma_name += pre_read == "1" ? "Enabled" : "Disabled";
2092 AddPreReadHistogramTime(uma_name.c_str(), time); 2097 AddPreReadHistogramTime(uma_name.c_str(), time);
2093 } 2098 }
2094 #endif 2099 #endif
2095 #endif 2100 #endif
2096 } 2101 }
OLDNEW
« 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