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

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

Issue 3064002: Landing OEM customization CL for Denis... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser_init.h" 5 #include "chrome/browser/browser_init.h"
6 6
7 #include <algorithm> // For max(). 7 #include <algorithm> // For max().
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 if (command_line.HasSwitch(switches::kRestoreBackgroundContents) || 455 if (command_line.HasSwitch(switches::kRestoreBackgroundContents) ||
456 command_line.HasSwitch(switches::kKeepAliveForTest)) { 456 command_line.HasSwitch(switches::kKeepAliveForTest)) {
457 // Create status icons 457 // Create status icons
458 StatusTrayManager* tray = g_browser_process->status_tray_manager(); 458 StatusTrayManager* tray = g_browser_process->status_tray_manager();
459 if (tray) 459 if (tray)
460 tray->Init(profile); 460 tray->Init(profile);
461 } 461 }
462 return true; 462 return true;
463 } 463 }
464 464
465 #if defined(OS_CHROMEOS)
466 bool BrowserInit::ApplyServicesCustomization(
467 const chromeos::ServicesCustomizationDocument* customization) {
468 GURL welcome_url(customization->initial_start_page_url());
469 DCHECK(welcome_url.is_valid()) << welcome_url;
470 if (welcome_url.is_valid()) {
471 AddFirstRunTab(welcome_url);
472 }
473 // TODO(denisromanov): Add extensions and web apps customization here.
474 return true;
475 }
476 #endif
477
478 // LaunchWithProfile ---------------------------------------------------------- 465 // LaunchWithProfile ----------------------------------------------------------
479 466
480 BrowserInit::LaunchWithProfile::LaunchWithProfile( 467 BrowserInit::LaunchWithProfile::LaunchWithProfile(
481 const std::wstring& cur_dir, 468 const std::wstring& cur_dir,
482 const CommandLine& command_line) 469 const CommandLine& command_line)
483 : cur_dir_(cur_dir), 470 : cur_dir_(cur_dir),
484 command_line_(command_line), 471 command_line_(command_line),
485 profile_(NULL), 472 profile_(NULL),
486 browser_init_(NULL) { 473 browser_init_(NULL) {
487 } 474 }
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 scoped_refptr<AutomationProviderClass> automation = 1052 scoped_refptr<AutomationProviderClass> automation =
1066 new AutomationProviderClass(profile); 1053 new AutomationProviderClass(profile);
1067 automation->ConnectToChannel(channel_id); 1054 automation->ConnectToChannel(channel_id);
1068 automation->SetExpectedTabCount(expected_tabs); 1055 automation->SetExpectedTabCount(expected_tabs);
1069 1056
1070 AutomationProviderList* list = 1057 AutomationProviderList* list =
1071 g_browser_process->InitAutomationProviderList(); 1058 g_browser_process->InitAutomationProviderList();
1072 DCHECK(list); 1059 DCHECK(list);
1073 list->AddProvider(automation); 1060 list->AddProvider(automation);
1074 } 1061 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698