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

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

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 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/ui/startup/autolaunch_prompt.h" 5 #include "chrome/browser/ui/startup/autolaunch_prompt.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
11 #include "chrome/browser/api/infobars/infobar_service.h" 11 #include "chrome/browser/api/infobars/infobar_service.h"
12 #include "chrome/browser/auto_launch_trial.h" 12 #include "chrome/browser/auto_launch_trial.h"
13 #include "chrome/browser/first_run/first_run.h" 13 #include "chrome/browser/first_run/first_run.h"
14 #include "chrome/browser/prefs/pref_registry_syncable.h"
14 #include "chrome/browser/prefs/pref_service.h" 15 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
18 #include "chrome/common/chrome_constants.h" 19 #include "chrome/common/chrome_constants.h"
19 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
20 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
21 #include "chrome/installer/util/auto_launch_util.h" 22 #include "chrome/installer/util/auto_launch_util.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/navigation_details.h" 24 #include "content/public/browser/navigation_details.h"
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 191
191 content::WebContents* web_contents = 192 content::WebContents* web_contents =
192 browser->tab_strip_model()->GetActiveWebContents(); 193 browser->tab_strip_model()->GetActiveWebContents();
193 profile = Profile::FromBrowserContext(web_contents->GetBrowserContext()); 194 profile = Profile::FromBrowserContext(web_contents->GetBrowserContext());
194 AutolaunchInfoBarDelegate::Create( 195 AutolaunchInfoBarDelegate::Create(
195 InfoBarService::FromWebContents(web_contents), profile->GetPrefs(), 196 InfoBarService::FromWebContents(web_contents), profile->GetPrefs(),
196 profile); 197 profile);
197 return true; 198 return true;
198 } 199 }
199 200
200 void RegisterAutolaunchUserPrefs(PrefServiceSyncable* prefs) { 201 void RegisterAutolaunchUserPrefs(PrefRegistrySyncable* registry) {
201 prefs->RegisterIntegerPref( 202 registry->RegisterIntegerPref(
202 prefs::kShownAutoLaunchInfobar, 0, PrefServiceSyncable::UNSYNCABLE_PREF); 203 prefs::kShownAutoLaunchInfobar, 0, PrefRegistrySyncable::UNSYNCABLE_PREF);
203 } 204 }
204 205
205 } // namespace chrome 206 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698