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

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

Issue 11365023: Fix M23 build. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1271/src/
Patch Set: Created 8 years, 1 month 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/extensions/default_app_order.cc » ('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 "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 username, false /* wait_for_policy_fetch */); 404 username, false /* wait_for_policy_fetch */);
405 } 405 }
406 406
407 // Load the default app order synchronously for restarting case. 407 // Load the default app order synchronously for restarting case.
408 app_order_loader_.reset( 408 app_order_loader_.reset(
409 new chromeos::default_app_order::ExternalLoader(false /* async */)); 409 new chromeos::default_app_order::ExternalLoader(false /* async */));
410 410
411 chromeos::UserManager::Get()->SessionStarted(); 411 chromeos::UserManager::Get()->SessionStarted();
412 } 412 }
413 413
414 if (!app_order_loader_) { 414 if (!app_order_loader_.get()) {
415 app_order_loader_.reset( 415 app_order_loader_.reset(
416 new chromeos::default_app_order::ExternalLoader(true /* async */)); 416 new chromeos::default_app_order::ExternalLoader(true /* async */));
417 } 417 }
418 418
419 // In Aura builds this will initialize ash::Shell. 419 // In Aura builds this will initialize ash::Shell.
420 ChromeBrowserMainPartsLinux::PreProfileInit(); 420 ChromeBrowserMainPartsLinux::PreProfileInit();
421 } 421 }
422 422
423 void ChromeBrowserMainPartsChromeos::PostProfileInit() { 423 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
424 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 424 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 621 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
622 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 622 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
623 } else if (trial->group() == margin_200mb) { 623 } else if (trial->group() == margin_200mb) {
624 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 624 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
625 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 625 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
626 } else { 626 } else {
627 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 627 LOG(WARNING) << "low_mem: Part of 'default' experiment";
628 } 628 }
629 } 629 }
630 } 630 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698