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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2616003002: Revert "[CUPS] Fix the browser crash in CUPS settings UI in guest mode." (Closed)
Patch Set: rebase Created 3 years, 11 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/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 702
703 #if !defined(OS_CHROMEOS) 703 #if !defined(OS_CHROMEOS)
704 values->SetBoolean( 704 values->SetBoolean(
705 "gpuEnabledAtStart", 705 "gpuEnabledAtStart",
706 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref()); 706 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref());
707 #endif 707 #endif
708 708
709 #if defined(OS_CHROMEOS) 709 #if defined(OS_CHROMEOS)
710 values->SetBoolean("cupsPrintEnabled", 710 values->SetBoolean("cupsPrintEnabled",
711 base::CommandLine::ForCurrentProcess()->HasSwitch( 711 base::CommandLine::ForCurrentProcess()->HasSwitch(
712 ::switches::kEnableNativeCups) && 712 ::switches::kEnableNativeCups));
713 !profile->IsOffTheRecord());
714 values->SetString("cupsPrintLearnMoreURL", 713 values->SetString("cupsPrintLearnMoreURL",
715 chrome::kChromeUIMdCupsSettingsURL); 714 chrome::kChromeUIMdCupsSettingsURL);
716 #endif // defined(OS_CHROMEOS) 715 #endif // defined(OS_CHROMEOS)
717 716
718 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 717 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
719 values->SetBoolean("cloudPrintHideNotificationsCheckbox", 718 values->SetBoolean("cloudPrintHideNotificationsCheckbox",
720 !cloud_print::PrivetNotificationService::IsEnabled()); 719 !cloud_print::PrivetNotificationService::IsEnabled());
721 #endif 720 #endif
722 721
723 values->SetBoolean("cloudPrintShowMDnsOptions", 722 values->SetBoolean("cloudPrintShowMDnsOptions",
(...skipping 1577 matching lines...) Expand 10 before | Expand all | Expand 10 after
2301 2300
2302 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2301 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2303 #if defined(OS_CHROMEOS) 2302 #if defined(OS_CHROMEOS)
2304 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2303 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2305 #else 2304 #else
2306 return true; 2305 return true;
2307 #endif 2306 #endif
2308 } 2307 }
2309 2308
2310 } // namespace options 2309 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698