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

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

Powered by Google App Engine
This is Rietveld 408576698