OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2399 PrefService::UNSYNCABLE_PREF); | 2399 PrefService::UNSYNCABLE_PREF); |
2400 prefs->RegisterBooleanPref(prefs::kEnableTranslate, | 2400 prefs->RegisterBooleanPref(prefs::kEnableTranslate, |
2401 true, | 2401 true, |
2402 PrefService::SYNCABLE_PREF); | 2402 PrefService::SYNCABLE_PREF); |
2403 prefs->RegisterStringPref(prefs::kCloudPrintEmail, | 2403 prefs->RegisterStringPref(prefs::kCloudPrintEmail, |
2404 std::string(), | 2404 std::string(), |
2405 PrefService::UNSYNCABLE_PREF); | 2405 PrefService::UNSYNCABLE_PREF); |
2406 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, | 2406 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, |
2407 true, | 2407 true, |
2408 PrefService::UNSYNCABLE_PREF); | 2408 PrefService::UNSYNCABLE_PREF); |
| 2409 prefs->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, |
| 2410 true, |
| 2411 PrefService::UNSYNCABLE_PREF); |
2409 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, | 2412 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, |
2410 false, | 2413 false, |
2411 PrefService::UNSYNCABLE_PREF); | 2414 PrefService::UNSYNCABLE_PREF); |
2412 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, | 2415 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, |
2413 -1, | 2416 -1, |
2414 PrefService::UNSYNCABLE_PREF); | 2417 PrefService::UNSYNCABLE_PREF); |
2415 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, | 2418 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, |
2416 PrefService::UNSYNCABLE_PREF); | 2419 PrefService::UNSYNCABLE_PREF); |
2417 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, | 2420 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, |
2418 PrefService::UNSYNCABLE_PREF); | 2421 PrefService::UNSYNCABLE_PREF); |
(...skipping 3096 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5515 } | 5518 } |
5516 | 5519 |
5517 void Browser::UpdateFullscreenExitBubbleContent() { | 5520 void Browser::UpdateFullscreenExitBubbleContent() { |
5518 GURL url; | 5521 GURL url; |
5519 if (fullscreened_tab_) | 5522 if (fullscreened_tab_) |
5520 url = fullscreened_tab_->tab_contents()->GetURL(); | 5523 url = fullscreened_tab_->tab_contents()->GetURL(); |
5521 | 5524 |
5522 window_->UpdateFullscreenExitBubbleContent( | 5525 window_->UpdateFullscreenExitBubbleContent( |
5523 url, GetFullscreenExitBubbleType()); | 5526 url, GetFullscreenExitBubbleType()); |
5524 } | 5527 } |
OLD | NEW |