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

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

Issue 2535303003: [CUPS] Fix the browser crash in CUPS settings UI in guest mode. (Closed)
Patch Set: Created 4 years 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 699
700 #if !defined(OS_CHROMEOS) 700 #if !defined(OS_CHROMEOS)
701 values->SetBoolean( 701 values->SetBoolean(
702 "gpuEnabledAtStart", 702 "gpuEnabledAtStart",
703 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref()); 703 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref());
704 #endif 704 #endif
705 705
706 #if defined(OS_CHROMEOS) 706 #if defined(OS_CHROMEOS)
707 values->SetBoolean("cupsPrintEnabled", 707 values->SetBoolean("cupsPrintEnabled",
708 base::CommandLine::ForCurrentProcess()->HasSwitch( 708 base::CommandLine::ForCurrentProcess()->HasSwitch(
709 ::switches::kEnableNativeCups)); 709 ::switches::kEnableNativeCups) &&
710 !profile->IsOffTheRecord());
710 values->SetString("cupsPrintLearnMoreURL", 711 values->SetString("cupsPrintLearnMoreURL",
711 chrome::kChromeUIMdCupsSettingsURL); 712 chrome::kChromeUIMdCupsSettingsURL);
712 #endif // defined(OS_CHROMEOS) 713 #endif // defined(OS_CHROMEOS)
713 714
714 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY) 715 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
715 values->SetBoolean("cloudPrintHideNotificationsCheckbox", 716 values->SetBoolean("cloudPrintHideNotificationsCheckbox",
716 !cloud_print::PrivetNotificationService::IsEnabled()); 717 !cloud_print::PrivetNotificationService::IsEnabled());
717 #endif 718 #endif
718 719
719 values->SetBoolean("cloudPrintShowMDnsOptions", 720 values->SetBoolean("cloudPrintShowMDnsOptions",
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after
2290 2291
2291 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2292 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2292 #if defined(OS_CHROMEOS) 2293 #if defined(OS_CHROMEOS)
2293 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2294 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2294 #else 2295 #else
2295 return true; 2296 return true;
2296 #endif 2297 #endif
2297 } 2298 }
2298 2299
2299 } // namespace options 2300 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698