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

Side by Side Diff: chrome/browser/ui/webui/options2/browser_options_handler2.cc

Issue 10698099: Implement the new wallpaper manager launcher window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 8 years, 5 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/options2/browser_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ui/base/l10n/l10n_util.h" 76 #include "ui/base/l10n/l10n_util.h"
77 77
78 #if !defined(OS_CHROMEOS) 78 #if !defined(OS_CHROMEOS)
79 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" 79 #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h"
80 #include "chrome/browser/ui/webui/options2/advanced_options_utils2.h" 80 #include "chrome/browser/ui/webui/options2/advanced_options_utils2.h"
81 #endif 81 #endif
82 82
83 #if defined(OS_CHROMEOS) 83 #if defined(OS_CHROMEOS)
84 #include "chrome/browser/chromeos/accessibility/accessibility_util.h" 84 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
85 #include "chrome/browser/chromeos/cros_settings.h" 85 #include "chrome/browser/chromeos/cros_settings.h"
86 #include "chrome/browser/chromeos/extensions/wallpaper_manager_api.h"
86 #include "chrome/browser/chromeos/login/user_manager.h" 87 #include "chrome/browser/chromeos/login/user_manager.h"
87 #include "chrome/browser/chromeos/options/take_photo_dialog.h" 88 #include "chrome/browser/chromeos/options/take_photo_dialog.h"
88 #include "chrome/browser/ui/browser_window.h" 89 #include "chrome/browser/ui/browser_window.h"
89 #include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h" 90 #include "chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.h"
90 #include "ui/gfx/image/image_skia.h" 91 #include "ui/gfx/image/image_skia.h"
91 #endif // defined(OS_CHROMEOS) 92 #endif // defined(OS_CHROMEOS)
92 93
93 #if defined(OS_WIN) 94 #if defined(OS_WIN)
94 #include "chrome/installer/util/auto_launch_util.h" 95 #include "chrome/installer/util/auto_launch_util.h"
95 #endif // defined(OS_WIN) 96 #endif // defined(OS_WIN)
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 base::Bind(&BrowserOptionsHandler::HandleCheckRevocationCheckbox, 511 base::Bind(&BrowserOptionsHandler::HandleCheckRevocationCheckbox,
511 base::Unretained(this))); 512 base::Unretained(this)));
512 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 513 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
513 web_ui()->RegisterMessageCallback( 514 web_ui()->RegisterMessageCallback(
514 "backgroundModeAction", 515 "backgroundModeAction",
515 base::Bind(&BrowserOptionsHandler::HandleBackgroundModeCheckbox, 516 base::Bind(&BrowserOptionsHandler::HandleBackgroundModeCheckbox,
516 base::Unretained(this))); 517 base::Unretained(this)));
517 #endif 518 #endif
518 #if defined(OS_CHROMEOS) 519 #if defined(OS_CHROMEOS)
519 web_ui()->RegisterMessageCallback( 520 web_ui()->RegisterMessageCallback(
521 "openWallpaperManager",
522 base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager,
523 base::Unretained(this)));
524 web_ui()->RegisterMessageCallback(
520 "spokenFeedbackChange", 525 "spokenFeedbackChange",
521 base::Bind(&BrowserOptionsHandler::SpokenFeedbackChangeCallback, 526 base::Bind(&BrowserOptionsHandler::SpokenFeedbackChangeCallback,
522 base::Unretained(this))); 527 base::Unretained(this)));
523 web_ui()->RegisterMessageCallback( 528 web_ui()->RegisterMessageCallback(
524 "highContrastChange", 529 "highContrastChange",
525 base::Bind(&BrowserOptionsHandler::HighContrastChangeCallback, 530 base::Bind(&BrowserOptionsHandler::HighContrastChangeCallback,
526 base::Unretained(this))); 531 base::Unretained(this)));
527 web_ui()->RegisterMessageCallback( 532 web_ui()->RegisterMessageCallback(
528 "screenMagnifierChange", 533 "screenMagnifierChange",
529 base::Bind(&BrowserOptionsHandler::ScreenMagnifierChangeCallback, 534 base::Bind(&BrowserOptionsHandler::ScreenMagnifierChangeCallback,
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
1247 allowed); 1252 allowed);
1248 } 1253 }
1249 1254
1250 void BrowserOptionsHandler::RemoveCloudPrintConnectorSection() { 1255 void BrowserOptionsHandler::RemoveCloudPrintConnectorSection() {
1251 web_ui()->CallJavascriptFunction( 1256 web_ui()->CallJavascriptFunction(
1252 "BrowserOptions.removeCloudPrintConnectorSection"); 1257 "BrowserOptions.removeCloudPrintConnectorSection");
1253 } 1258 }
1254 #endif 1259 #endif
1255 1260
1256 #if defined(OS_CHROMEOS) 1261 #if defined(OS_CHROMEOS)
1262 void BrowserOptionsHandler::HandleOpenWallpaperManager(
1263 const ListValue* args) {
1264 wallpaper_manager_util::OpenWallpaperManager();
1265 }
1266
1257 void BrowserOptionsHandler::SpokenFeedbackChangeCallback( 1267 void BrowserOptionsHandler::SpokenFeedbackChangeCallback(
1258 const ListValue* args) { 1268 const ListValue* args) {
1259 bool enabled = false; 1269 bool enabled = false;
1260 args->GetBoolean(0, &enabled); 1270 args->GetBoolean(0, &enabled);
1261 1271
1262 chromeos::accessibility::EnableSpokenFeedback(enabled, NULL); 1272 chromeos::accessibility::EnableSpokenFeedback(enabled, NULL);
1263 } 1273 }
1264 1274
1265 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) { 1275 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) {
1266 bool enabled = false; 1276 bool enabled = false;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1420 } 1430 }
1421 1431
1422 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1432 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1423 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1433 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1424 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1434 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1425 web_ui()->CallJavascriptFunction( 1435 web_ui()->CallJavascriptFunction(
1426 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1436 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1427 } 1437 }
1428 1438
1429 } // namespace options2 1439 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698