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

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

Issue 10698099: Implement the new wallpaper manager launcher window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix presubmit errors 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
« no previous file with comments | « chrome/browser/ui/webui/options2/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_handler.h" 5 #include "chrome/browser/ui/webui/options2/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 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_utils.h" 81 #include "chrome/browser/ui/webui/options2/advanced_options_utils.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/chromeos/system_settings_provider.h" 90 #include "chrome/browser/chromeos/system_settings_provider.h"
90 #include "chrome/browser/ui/browser_window.h" 91 #include "chrome/browser/ui/browser_window.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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 base::Bind(&BrowserOptionsHandler::HandleCheckRevocationCheckbox, 514 base::Bind(&BrowserOptionsHandler::HandleCheckRevocationCheckbox,
514 base::Unretained(this))); 515 base::Unretained(this)));
515 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 516 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
516 web_ui()->RegisterMessageCallback( 517 web_ui()->RegisterMessageCallback(
517 "backgroundModeAction", 518 "backgroundModeAction",
518 base::Bind(&BrowserOptionsHandler::HandleBackgroundModeCheckbox, 519 base::Bind(&BrowserOptionsHandler::HandleBackgroundModeCheckbox,
519 base::Unretained(this))); 520 base::Unretained(this)));
520 #endif 521 #endif
521 #if defined(OS_CHROMEOS) 522 #if defined(OS_CHROMEOS)
522 web_ui()->RegisterMessageCallback( 523 web_ui()->RegisterMessageCallback(
524 "openWallpaperManager",
525 base::Bind(&BrowserOptionsHandler::HandleOpenWallpaperManager,
526 base::Unretained(this)));
527 web_ui()->RegisterMessageCallback(
523 "spokenFeedbackChange", 528 "spokenFeedbackChange",
524 base::Bind(&BrowserOptionsHandler::SpokenFeedbackChangeCallback, 529 base::Bind(&BrowserOptionsHandler::SpokenFeedbackChangeCallback,
525 base::Unretained(this))); 530 base::Unretained(this)));
526 web_ui()->RegisterMessageCallback( 531 web_ui()->RegisterMessageCallback(
527 "highContrastChange", 532 "highContrastChange",
528 base::Bind(&BrowserOptionsHandler::HighContrastChangeCallback, 533 base::Bind(&BrowserOptionsHandler::HighContrastChangeCallback,
529 base::Unretained(this))); 534 base::Unretained(this)));
530 web_ui()->RegisterMessageCallback( 535 web_ui()->RegisterMessageCallback(
531 "screenMagnifierChange", 536 "screenMagnifierChange",
532 base::Bind(&BrowserOptionsHandler::ScreenMagnifierChangeCallback, 537 base::Bind(&BrowserOptionsHandler::ScreenMagnifierChangeCallback,
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
1270 allowed); 1275 allowed);
1271 } 1276 }
1272 1277
1273 void BrowserOptionsHandler::RemoveCloudPrintConnectorSection() { 1278 void BrowserOptionsHandler::RemoveCloudPrintConnectorSection() {
1274 web_ui()->CallJavascriptFunction( 1279 web_ui()->CallJavascriptFunction(
1275 "BrowserOptions.removeCloudPrintConnectorSection"); 1280 "BrowserOptions.removeCloudPrintConnectorSection");
1276 } 1281 }
1277 #endif 1282 #endif
1278 1283
1279 #if defined(OS_CHROMEOS) 1284 #if defined(OS_CHROMEOS)
1285 void BrowserOptionsHandler::HandleOpenWallpaperManager(
1286 const ListValue* args) {
1287 wallpaper_manager_util::OpenWallpaperManager();
1288 }
1289
1280 void BrowserOptionsHandler::SpokenFeedbackChangeCallback( 1290 void BrowserOptionsHandler::SpokenFeedbackChangeCallback(
1281 const ListValue* args) { 1291 const ListValue* args) {
1282 bool enabled = false; 1292 bool enabled = false;
1283 args->GetBoolean(0, &enabled); 1293 args->GetBoolean(0, &enabled);
1284 1294
1285 chromeos::accessibility::EnableSpokenFeedback(enabled, NULL); 1295 chromeos::accessibility::EnableSpokenFeedback(enabled, NULL);
1286 } 1296 }
1287 1297
1288 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) { 1298 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) {
1289 bool enabled = false; 1299 bool enabled = false;
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 } 1453 }
1444 1454
1445 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1455 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1446 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1456 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1447 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1457 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1448 web_ui()->CallJavascriptFunction( 1458 web_ui()->CallJavascriptFunction(
1449 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1459 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1450 } 1460 }
1451 1461
1452 } // namespace options2 1462 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options2/browser_options_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698