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

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

Issue 1553333002: Move cloud print specific files out of local_discovery (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveprn
Patch Set: Created 4 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 <string> 10 #include <string>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 #include "ui/chromeos/accessibility_types.h" 135 #include "ui/chromeos/accessibility_types.h"
136 #include "ui/gfx/image/image_skia.h" 136 #include "ui/gfx/image/image_skia.h"
137 #endif // defined(OS_CHROMEOS) 137 #endif // defined(OS_CHROMEOS)
138 138
139 #if defined(OS_WIN) 139 #if defined(OS_WIN)
140 #include "chrome/browser/extensions/settings_api_helpers.h" 140 #include "chrome/browser/extensions/settings_api_helpers.h"
141 #include "content/public/browser/browser_url_handler.h" 141 #include "content/public/browser/browser_url_handler.h"
142 #endif // defined(OS_WIN) 142 #endif // defined(OS_WIN)
143 143
144 #if defined(ENABLE_SERVICE_DISCOVERY) 144 #if defined(ENABLE_SERVICE_DISCOVERY)
145 #include "chrome/browser/local_discovery/privet_notifications.h" 145 #include "chrome/browser/printing/cloud_print/privet_notifications.h"
146 #endif 146 #endif
147 147
148 #if defined(USE_ASH) 148 #if defined(USE_ASH)
149 #include "ash/shell.h" 149 #include "ash/shell.h"
150 #endif 150 #endif
151 151
152 using base::UserMetricsAction; 152 using base::UserMetricsAction;
153 using content::BrowserContext; 153 using content::BrowserContext;
154 using content::BrowserThread; 154 using content::BrowserThread;
155 using content::DownloadManager; 155 using content::DownloadManager;
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 Profile::FromWebUI(web_ui())->IsSupervised()); 638 Profile::FromWebUI(web_ui())->IsSupervised());
639 639
640 #if !defined(OS_CHROMEOS) 640 #if !defined(OS_CHROMEOS)
641 values->SetBoolean( 641 values->SetBoolean(
642 "gpuEnabledAtStart", 642 "gpuEnabledAtStart",
643 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref()); 643 g_browser_process->gpu_mode_manager()->initial_gpu_mode_pref());
644 #endif 644 #endif
645 645
646 #if defined(ENABLE_SERVICE_DISCOVERY) 646 #if defined(ENABLE_SERVICE_DISCOVERY)
647 values->SetBoolean("cloudPrintHideNotificationsCheckbox", 647 values->SetBoolean("cloudPrintHideNotificationsCheckbox",
648 !local_discovery::PrivetNotificationService::IsEnabled()); 648 !cloud_print::PrivetNotificationService::IsEnabled());
649 #endif 649 #endif
650 650
651 values->SetBoolean("cloudPrintShowMDnsOptions", 651 values->SetBoolean("cloudPrintShowMDnsOptions",
652 cloud_print_mdns_ui_enabled_); 652 cloud_print_mdns_ui_enabled_);
653 653
654 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL); 654 values->SetString("cloudPrintLearnMoreURL", chrome::kCloudPrintLearnMoreURL);
655 655
656 values->SetString("languagesLearnMoreURL", 656 values->SetString("languagesLearnMoreURL",
657 chrome::kLanguageSettingsLearnMoreUrl); 657 chrome::kLanguageSettingsLearnMoreUrl);
658 658
(...skipping 1489 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 2148
2149 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2149 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2150 #if defined(OS_CHROMEOS) 2150 #if defined(OS_CHROMEOS)
2151 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2151 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2152 #else 2152 #else
2153 return true; 2153 return true;
2154 #endif 2154 #endif
2155 } 2155 }
2156 2156
2157 } // namespace options 2157 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698