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

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

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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 | Annotate | Revision Log
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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); 456 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
457 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 457 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
458 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 458 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
459 magnifier_list->Append(option_partial.release()); 459 magnifier_list->Append(option_partial.release());
460 460
461 values->Set("magnifierList", magnifier_list.release()); 461 values->Set("magnifierList", magnifier_list.release());
462 462
463 // Sets flag of whether kiosk section should be enabled. 463 // Sets flag of whether kiosk section should be enabled.
464 values->SetBoolean( 464 values->SetBoolean(
465 "enableKioskSection", 465 "enableKioskSection",
466 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppMode) && 466 !CommandLine::ForCurrentProcess()->HasSwitch(
467 chromeos::switches::kDisableAppMode) &&
467 (chromeos::UserManager::Get()->IsCurrentUserOwner() || 468 (chromeos::UserManager::Get()->IsCurrentUserOwner() ||
468 !base::chromeos::IsRunningOnChromeOS())); 469 !base::chromeos::IsRunningOnChromeOS()));
469 #endif 470 #endif
470 471
471 #if defined(OS_MACOSX) 472 #if defined(OS_MACOSX)
472 values->SetString("macPasswordsWarning", 473 values->SetString("macPasswordsWarning",
473 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 474 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
474 values->SetBoolean("multiple_profiles", 475 values->SetBoolean("multiple_profiles",
475 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1); 476 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
476 #endif 477 #endif
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after
1519 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1520 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1520 is_extension_controlled); 1521 is_extension_controlled);
1521 base::FundamentalValue extension_controlled(is_extension_controlled); 1522 base::FundamentalValue extension_controlled(is_extension_controlled);
1522 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1523 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1523 disabled, extension_controlled); 1524 disabled, extension_controlled);
1524 1525
1525 #endif // !defined(OS_CHROMEOS) 1526 #endif // !defined(OS_CHROMEOS)
1526 } 1527 }
1527 1528
1528 } // namespace options 1529 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698