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

Side by Side Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
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/ui/startup/startup_browser_creator_impl.h" 5 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/environment.h" 10 #include "base/environment.h"
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 extensions_service->GetExtensionById(app_id, false); 186 extensions_service->GetExtensionById(app_id, false);
187 187
188 // The extension with id |app_id| may have been uninstalled. 188 // The extension with id |app_id| may have been uninstalled.
189 if (!extension) 189 if (!extension)
190 return false; 190 return false;
191 191
192 // Look at preferences to find the right launch container. If no 192 // Look at preferences to find the right launch container. If no
193 // preference is set, launch as a window. 193 // preference is set, launch as a window.
194 extension_misc::LaunchContainer launch_container = 194 extension_misc::LaunchContainer launch_container =
195 extensions_service->extension_prefs()->GetLaunchContainer( 195 extensions_service->extension_prefs()->GetLaunchContainer(
196 extension, ExtensionPrefs::LAUNCH_WINDOW); 196 extension, extensions::ExtensionPrefs::LAUNCH_WINDOW);
197 197
198 *out_extension = extension; 198 *out_extension = extension;
199 *out_launch_container = launch_container; 199 *out_launch_container = launch_container;
200 return true; 200 return true;
201 } 201 }
202 202
203 void RecordCmdLineAppHistogram() { 203 void RecordCmdLineAppHistogram() {
204 AppLauncherHandler::RecordAppLaunchType( 204 AppLauncherHandler::RecordAppLaunchType(
205 extension_misc::APP_LAUNCH_CMD_LINE_APP); 205 extension_misc::APP_LAUNCH_CMD_LINE_APP);
206 } 206 }
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 // New: 860 // New:
861 prefs->GetString(prefs::kHomePage), 861 prefs->GetString(prefs::kHomePage),
862 prefs->GetBoolean(prefs::kHomePageIsNewTabPage), 862 prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
863 prefs->GetBoolean(prefs::kShowHomeButton), 863 prefs->GetBoolean(prefs::kShowHomeButton),
864 // Backup: 864 // Backup:
865 backup_homepage, 865 backup_homepage,
866 backup_homepage_is_ntp, 866 backup_homepage_is_ntp,
867 backup_show_home_button)); 867 backup_show_home_button));
868 } 868 }
869 } 869 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698