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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 136003008: [Variations] Read the policy from profile prefs if on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing logging Created 6 years, 10 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) 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 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 // triggering the timer and call that explicitly in the approprate place. 1493 // triggering the timer and call that explicitly in the approprate place.
1494 // http://crbug.com/105065. 1494 // http://crbug.com/105065.
1495 browser_process_->notification_ui_manager(); 1495 browser_process_->notification_ui_manager();
1496 1496
1497 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate)) 1497 if (!parsed_command_line().HasSwitch(switches::kDisableComponentUpdate))
1498 RegisterComponentsForUpdate(parsed_command_line()); 1498 RegisterComponentsForUpdate(parsed_command_line());
1499 1499
1500 #if defined(OS_ANDROID) 1500 #if defined(OS_ANDROID)
1501 chrome_variations::VariationsService* variations_service = 1501 chrome_variations::VariationsService* variations_service =
1502 browser_process_->variations_service(); 1502 browser_process_->variations_service();
1503 if (variations_service) 1503 if (variations_service) {
1504 if (profile_ && profile_->GetPrefs())
Alexei Svitkine (slow) 2014/02/10 22:12:48 Under what circumstances would these be NULL? If t
Mathieu 2014/02/10 22:41:34 Done. You're right, I don't see other code checkin
1505 variations_service->set_policy_pref_service(profile_->GetPrefs());
1504 variations_service->StartRepeatedVariationsSeedFetch(); 1506 variations_service->StartRepeatedVariationsSeedFetch();
1507 }
1505 #else 1508 #else
1506 // Most general initialization is behind us, but opening a 1509 // Most general initialization is behind us, but opening a
1507 // tab and/or session restore and such is still to be done. 1510 // tab and/or session restore and such is still to be done.
1508 base::TimeTicks browser_open_start = base::TimeTicks::Now(); 1511 base::TimeTicks browser_open_start = base::TimeTicks::Now();
1509 1512
1510 // We are in regular browser boot sequence. Open initial tabs and enter the 1513 // We are in regular browser boot sequence. Open initial tabs and enter the
1511 // main message loop. 1514 // main message loop.
1512 int result_code; 1515 int result_code;
1513 #if defined(OS_CHROMEOS) 1516 #if defined(OS_CHROMEOS)
1514 // On ChromeOS multiple profiles doesn't apply, and will break if we load 1517 // On ChromeOS multiple profiles doesn't apply, and will break if we load
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1697 chromeos::CrosSettings::Shutdown(); 1700 chromeos::CrosSettings::Shutdown();
1698 #endif 1701 #endif
1699 #endif 1702 #endif
1700 } 1703 }
1701 1704
1702 // Public members: 1705 // Public members:
1703 1706
1704 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1707 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1705 chrome_extra_parts_.push_back(parts); 1708 chrome_extra_parts_.push_back(parts);
1706 } 1709 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698