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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 10821078: chromeos: Get rid of browser namespace usage in kiosk_mode_idle_logout.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 345
346 // Trigger prefetching of ownership status. 346 // Trigger prefetching of ownership status.
347 chromeos::OwnershipService::GetSharedInstance()->Prewarm(); 347 chromeos::OwnershipService::GetSharedInstance()->Prewarm();
348 348
349 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 349 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
350 // -- just before CreateProfile(). 350 // -- just before CreateProfile().
351 351
352 // Initialize the screen locker now so that it can receive 352 // Initialize the screen locker now so that it can receive
353 // LOGIN_USER_CHANGED notification from UserManager. 353 // LOGIN_USER_CHANGED notification from UserManager.
354 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) { 354 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
355 chromeos::InitializeKioskModeIdleLogout(); 355 chromeos::KioskModeIdleLogout::Initialize();
356 } else { 356 } else {
357 chromeos::ScreenLocker::InitClass(); 357 chromeos::ScreenLocker::InitClass();
358 } 358 }
359 359
360 // This forces the ProfileManager to be created and register for the 360 // This forces the ProfileManager to be created and register for the
361 // notification it needs to track the logged in user. 361 // notification it needs to track the logged in user.
362 g_browser_process->profile_manager(); 362 g_browser_process->profile_manager();
363 363
364 // TODO(abarth): Should this move to InitializeNetworkOptions()? 364 // TODO(abarth): Should this move to InitializeNetworkOptions()?
365 // Allow access to file:// on ChromeOS for tests. 365 // Allow access to file:// on ChromeOS for tests.
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
581 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 581 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
582 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 582 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
583 } else if (trial->group() == margin_200mb) { 583 } else if (trial->group() == margin_200mb) {
584 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 584 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
585 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 585 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
586 } else { 586 } else {
587 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 587 LOG(WARNING) << "low_mem: Part of 'default' experiment";
588 } 588 }
589 } 589 }
590 } 590 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698