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 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1476 // triggering the timer and call that explicitly in the approprate place. | 1476 // triggering the timer and call that explicitly in the approprate place. |
1477 // http://crbug.com/105065. | 1477 // http://crbug.com/105065. |
1478 browser_process_->notification_ui_manager(); | 1478 browser_process_->notification_ui_manager(); |
1479 | 1479 |
1480 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) | 1480 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) |
1481 RegisterComponentsForUpdate(parsed_command_line()); | 1481 RegisterComponentsForUpdate(parsed_command_line()); |
1482 | 1482 |
1483 #if defined(OS_ANDROID) | 1483 #if defined(OS_ANDROID) |
1484 chrome_variations::VariationsService* variations_service = | 1484 chrome_variations::VariationsService* variations_service = |
1485 browser_process_->variations_service(); | 1485 browser_process_->variations_service(); |
1486 if (profile_ && profile_->GetPrefs()) | |
1487 variations_service->set_policy_pref_service(profile_->GetPrefs()); | |
Joao da Silva
2014/01/28 14:19:35
The line below tests |variations_service|, should
Mathieu
2014/01/28 14:24:47
Sure. Done.
| |
1486 if (variations_service) | 1488 if (variations_service) |
1487 variations_service->StartRepeatedVariationsSeedFetch(); | 1489 variations_service->StartRepeatedVariationsSeedFetch(); |
1488 #else | 1490 #else |
1489 // Most general initialization is behind us, but opening a | 1491 // Most general initialization is behind us, but opening a |
1490 // tab and/or session restore and such is still to be done. | 1492 // tab and/or session restore and such is still to be done. |
1491 base::TimeTicks browser_open_start = base::TimeTicks::Now(); | 1493 base::TimeTicks browser_open_start = base::TimeTicks::Now(); |
1492 | 1494 |
1493 // We are in regular browser boot sequence. Open initial tabs and enter the | 1495 // We are in regular browser boot sequence. Open initial tabs and enter the |
1494 // main message loop. | 1496 // main message loop. |
1495 int result_code; | 1497 int result_code; |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1686 chromeos::CrosSettings::Shutdown(); | 1688 chromeos::CrosSettings::Shutdown(); |
1687 #endif | 1689 #endif |
1688 #endif | 1690 #endif |
1689 } | 1691 } |
1690 | 1692 |
1691 // Public members: | 1693 // Public members: |
1692 | 1694 |
1693 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1695 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1694 chrome_extra_parts_.push_back(parts); | 1696 chrome_extra_parts_.push_back(parts); |
1695 } | 1697 } |
OLD | NEW |