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

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

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/advanced_options_handler.h" 5 #include "chrome/browser/ui/webui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 AdvancedOptionsUtilities::ShowManageSSLCertificates(web_ui_->tab_contents()); 426 AdvancedOptionsUtilities::ShowManageSSLCertificates(web_ui_->tab_contents());
427 } 427 }
428 #endif 428 #endif
429 429
430 void AdvancedOptionsHandler::ShowCloudPrintManagePage(const ListValue* args) { 430 void AdvancedOptionsHandler::ShowCloudPrintManagePage(const ListValue* args) {
431 UserMetrics::RecordAction(UserMetricsAction("Options_ManageCloudPrinters")); 431 UserMetrics::RecordAction(UserMetricsAction("Options_ManageCloudPrinters"));
432 // Open a new tab in the current window for the management page. 432 // Open a new tab in the current window for the management page.
433 Profile* profile = Profile::FromWebUI(web_ui_); 433 Profile* profile = Profile::FromWebUI(web_ui_);
434 web_ui_->tab_contents()->OpenURL( 434 web_ui_->tab_contents()->OpenURL(
435 CloudPrintURL(profile).GetCloudPrintServiceManageURL(), 435 CloudPrintURL(profile).GetCloudPrintServiceManageURL(),
436 GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK); 436 GURL(), NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
437 } 437 }
438 438
439 #if !defined(OS_CHROMEOS) 439 #if !defined(OS_CHROMEOS)
440 void AdvancedOptionsHandler::ShowCloudPrintSetupDialog(const ListValue* args) { 440 void AdvancedOptionsHandler::ShowCloudPrintSetupDialog(const ListValue* args) {
441 UserMetrics::RecordAction(UserMetricsAction("Options_EnableCloudPrintProxy")); 441 UserMetrics::RecordAction(UserMetricsAction("Options_EnableCloudPrintProxy"));
442 // Open the connector enable page in the current tab. 442 // Open the connector enable page in the current tab.
443 Profile* profile = Profile::FromWebUI(web_ui_); 443 Profile* profile = Profile::FromWebUI(web_ui_);
444 web_ui_->tab_contents()->OpenURL( 444 web_ui_->tab_contents()->OpenURL(
445 CloudPrintURL(profile).GetCloudPrintServiceEnableURL( 445 CloudPrintURL(profile).GetCloudPrintServiceEnableURL(
446 CloudPrintProxyServiceFactory::GetForProfile(profile)->proxy_id()), 446 CloudPrintProxyServiceFactory::GetForProfile(profile)->proxy_id()),
447 GURL(), CURRENT_TAB, PageTransition::LINK); 447 GURL(), CURRENT_TAB, content::PAGE_TRANSITION_LINK);
448 } 448 }
449 449
450 void AdvancedOptionsHandler::HandleDisableCloudPrintProxy( 450 void AdvancedOptionsHandler::HandleDisableCloudPrintProxy(
451 const ListValue* args) { 451 const ListValue* args) {
452 UserMetrics::RecordAction( 452 UserMetrics::RecordAction(
453 UserMetricsAction("Options_DisableCloudPrintProxy")); 453 UserMetricsAction("Options_DisableCloudPrintProxy"));
454 CloudPrintProxyServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_))-> 454 CloudPrintProxyServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_))->
455 DisableForUser(); 455 DisableForUser();
456 } 456 }
457 457
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 573
574 void AdvancedOptionsHandler::SetupSSLConfigSettings() { 574 void AdvancedOptionsHandler::SetupSSLConfigSettings() {
575 { 575 {
576 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 576 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
577 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 577 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
578 web_ui_->CallJavascriptFunction( 578 web_ui_->CallJavascriptFunction(
579 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked, 579 "options.AdvancedOptions.SetCheckRevocationCheckboxState", checked,
580 disabled); 580 disabled);
581 } 581 }
582 } 582 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/ntp_login_handler.cc ('k') | chrome/browser/ui/webui/options/advanced_options_utils_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698