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 2384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2395 PrefService::UNSYNCABLE_PREF); | 2395 PrefService::UNSYNCABLE_PREF); |
2396 prefs->RegisterBooleanPref(prefs::kEnableTranslate, | 2396 prefs->RegisterBooleanPref(prefs::kEnableTranslate, |
2397 true, | 2397 true, |
2398 PrefService::SYNCABLE_PREF); | 2398 PrefService::SYNCABLE_PREF); |
2399 prefs->RegisterStringPref(prefs::kCloudPrintEmail, | 2399 prefs->RegisterStringPref(prefs::kCloudPrintEmail, |
2400 std::string(), | 2400 std::string(), |
2401 PrefService::UNSYNCABLE_PREF); | 2401 PrefService::UNSYNCABLE_PREF); |
2402 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, | 2402 prefs->RegisterBooleanPref(prefs::kCloudPrintProxyEnabled, |
2403 true, | 2403 true, |
2404 PrefService::UNSYNCABLE_PREF); | 2404 PrefService::UNSYNCABLE_PREF); |
| 2405 prefs->RegisterBooleanPref(prefs::kCloudPrintSubmitEnabled, |
| 2406 true, |
| 2407 PrefService::UNSYNCABLE_PREF); |
2405 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, | 2408 prefs->RegisterBooleanPref(prefs::kDevToolsDisabled, |
2406 false, | 2409 false, |
2407 PrefService::UNSYNCABLE_PREF); | 2410 PrefService::UNSYNCABLE_PREF); |
2408 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, | 2411 prefs->RegisterIntegerPref(prefs::kDevToolsSplitLocation, |
2409 -1, | 2412 -1, |
2410 PrefService::UNSYNCABLE_PREF); | 2413 PrefService::UNSYNCABLE_PREF); |
2411 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, | 2414 prefs->RegisterDictionaryPref(prefs::kBrowserWindowPlacement, |
2412 PrefService::UNSYNCABLE_PREF); | 2415 PrefService::UNSYNCABLE_PREF); |
2413 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, | 2416 prefs->RegisterDictionaryPref(prefs::kPreferencesWindowPlacement, |
2414 PrefService::UNSYNCABLE_PREF); | 2417 PrefService::UNSYNCABLE_PREF); |
(...skipping 3092 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5507 } | 5510 } |
5508 | 5511 |
5509 void Browser::UpdateFullscreenExitBubbleContent() { | 5512 void Browser::UpdateFullscreenExitBubbleContent() { |
5510 GURL url; | 5513 GURL url; |
5511 if (fullscreened_tab_) | 5514 if (fullscreened_tab_) |
5512 url = fullscreened_tab_->tab_contents()->GetURL(); | 5515 url = fullscreened_tab_->tab_contents()->GetURL(); |
5513 | 5516 |
5514 window_->UpdateFullscreenExitBubbleContent( | 5517 window_->UpdateFullscreenExitBubbleContent( |
5515 url, GetFullscreenExitBubbleType()); | 5518 url, GetFullscreenExitBubbleType()); |
5516 } | 5519 } |
OLD | NEW |