Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_GTK) | 7 #if defined(TOOLKIT_GTK) |
| 8 #include <gtk/gtk.h> | 8 #include <gtk/gtk.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 506 } | 506 } |
| 507 | 507 |
| 508 private: | 508 private: |
| 509 content::NotificationRegistrar registrar_; | 509 content::NotificationRegistrar registrar_; |
| 510 DISALLOW_COPY_AND_ASSIGN(LoadCompleteListener); | 510 DISALLOW_COPY_AND_ASSIGN(LoadCompleteListener); |
| 511 }; | 511 }; |
| 512 | 512 |
| 513 } // namespace | 513 } // namespace |
| 514 | 514 |
| 515 namespace chrome_browser { | 515 namespace chrome_browser { |
| 516 | |
| 516 // This error message is not localized because we failed to load the | 517 // This error message is not localized because we failed to load the |
| 517 // localization data files. | 518 // localization data files. |
| 519 #if defined(OS_WIN) | |
| 518 const char kMissingLocaleDataTitle[] = "Missing File Error"; | 520 const char kMissingLocaleDataTitle[] = "Missing File Error"; |
| 521 #endif | |
| 522 | |
| 523 #if defined(OS_WIN) || defined(TOOLKIT_GTK) | |
| 524 // TODO(port) This should be used on Linux Aura as well. | |
|
Nico
2014/01/29 03:35:15
Where's this from? Should there be a bug for this?
Lei Zhang
2014/01/29 03:45:44
bug filed
| |
| 519 const char kMissingLocaleDataMessage[] = | 525 const char kMissingLocaleDataMessage[] = |
| 520 "Unable to find locale data files. Please reinstall."; | 526 "Unable to find locale data files. Please reinstall."; |
| 527 #endif | |
| 528 | |
| 521 } // namespace chrome_browser | 529 } // namespace chrome_browser |
| 522 | 530 |
| 523 // BrowserMainParts ------------------------------------------------------------ | 531 // BrowserMainParts ------------------------------------------------------------ |
| 524 | 532 |
| 525 // static | 533 // static |
| 526 bool ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = | 534 bool ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = |
| 527 false; | 535 false; |
| 528 | 536 |
| 529 ChromeBrowserMainParts::ChromeBrowserMainParts( | 537 ChromeBrowserMainParts::ChromeBrowserMainParts( |
| 530 const content::MainFunctionParams& parameters) | 538 const content::MainFunctionParams& parameters) |
| (...skipping 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1682 chromeos::CrosSettings::Shutdown(); | 1690 chromeos::CrosSettings::Shutdown(); |
| 1683 #endif | 1691 #endif |
| 1684 #endif | 1692 #endif |
| 1685 } | 1693 } |
| 1686 | 1694 |
| 1687 // Public members: | 1695 // Public members: |
| 1688 | 1696 |
| 1689 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1697 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1690 chrome_extra_parts_.push_back(parts); | 1698 chrome_extra_parts_.push_back(parts); |
| 1691 } | 1699 } |
| OLD | NEW |