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

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

Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reuploading for different try run. Created 8 years, 4 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_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 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1051 "autoLoginVisible", 1051 "autoLoginVisible",
1052 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) && 1052 CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutologin) &&
1053 service->IsSyncEnabledAndLoggedIn() && service->IsSyncTokenAvailable()); 1053 service->IsSyncEnabledAndLoggedIn() && service->IsSyncTokenAvailable());
1054 1054
1055 return sync_status.Pass(); 1055 return sync_status.Pass();
1056 } 1056 }
1057 1057
1058 void BrowserOptionsHandler::HandleSelectDownloadLocation( 1058 void BrowserOptionsHandler::HandleSelectDownloadLocation(
1059 const ListValue* args) { 1059 const ListValue* args) {
1060 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); 1060 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
1061 select_folder_dialog_ = SelectFileDialog::Create( 1061 select_folder_dialog_ = ui::SelectFileDialog::Create(
1062 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); 1062 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
1063 select_folder_dialog_->SelectFile( 1063 select_folder_dialog_->SelectFile(
1064 SelectFileDialog::SELECT_FOLDER, 1064 ui::SelectFileDialog::SELECT_FOLDER,
1065 l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE), 1065 l10n_util::GetStringUTF16(IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE),
1066 pref_service->GetFilePath(prefs::kDownloadDefaultDirectory), 1066 pref_service->GetFilePath(prefs::kDownloadDefaultDirectory),
1067 NULL, 0, FILE_PATH_LITERAL(""), 1067 NULL, 0, FILE_PATH_LITERAL(""),
1068 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL); 1068 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL);
1069 } 1069 }
1070 1070
1071 void BrowserOptionsHandler::FileSelected(const FilePath& path, int index, 1071 void BrowserOptionsHandler::FileSelected(const FilePath& path, int index,
1072 void* params) { 1072 void* params) {
1073 content::RecordAction(UserMetricsAction("Options_SetDownloadDirectory")); 1073 content::RecordAction(UserMetricsAction("Options_SetDownloadDirectory"));
1074 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs(); 1074 PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
1450 } 1450 }
1451 1451
1452 void BrowserOptionsHandler::SetupSSLConfigSettings() { 1452 void BrowserOptionsHandler::SetupSSLConfigSettings() {
1453 base::FundamentalValue checked(rev_checking_enabled_.GetValue()); 1453 base::FundamentalValue checked(rev_checking_enabled_.GetValue());
1454 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged()); 1454 base::FundamentalValue disabled(rev_checking_enabled_.IsManaged());
1455 web_ui()->CallJavascriptFunction( 1455 web_ui()->CallJavascriptFunction(
1456 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled); 1456 "BrowserOptions.setCheckRevocationCheckboxState", checked, disabled);
1457 } 1457 }
1458 1458
1459 } // namespace options2 1459 } // namespace options2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698