OLD | NEW |
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/callback.h" | 10 #include "base/callback.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 #if (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) || defined(OS_MACOSX) | 52 #if (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) || defined(OS_MACOSX) |
53 cloud_print_proxy_ui_enabled_ = true; | 53 cloud_print_proxy_ui_enabled_ = true; |
54 #elif !defined(OS_CHROMEOS) | 54 #elif !defined(OS_CHROMEOS) |
55 cloud_print_proxy_ui_enabled_ = | 55 cloud_print_proxy_ui_enabled_ = |
56 CommandLine::ForCurrentProcess()->HasSwitch( | 56 CommandLine::ForCurrentProcess()->HasSwitch( |
57 switches::kEnableCloudPrintProxy); | 57 switches::kEnableCloudPrintProxy); |
58 #endif | 58 #endif |
59 } | 59 } |
60 | 60 |
61 AdvancedOptionsHandler::~AdvancedOptionsHandler() { | 61 AdvancedOptionsHandler::~AdvancedOptionsHandler() { |
| 62 // There may be pending file dialogs, we need to tell them that we've gone |
| 63 // away so they don't try and call back to us. |
| 64 if (select_folder_dialog_.get()) |
| 65 select_folder_dialog_->ListenerDestroyed(); |
62 } | 66 } |
63 | 67 |
64 void AdvancedOptionsHandler::GetLocalizedValues( | 68 void AdvancedOptionsHandler::GetLocalizedValues( |
65 DictionaryValue* localized_strings) { | 69 DictionaryValue* localized_strings) { |
66 DCHECK(localized_strings); | 70 DCHECK(localized_strings); |
67 | 71 |
68 static OptionsStringResource resources[] = { | 72 static OptionsStringResource resources[] = { |
69 { "downloadLocationGroupName", | 73 { "downloadLocationGroupName", |
70 IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 74 IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, |
71 { "downloadLocationChangeButton", | 75 { "downloadLocationChangeButton", |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
709 FundamentalValue useSSL3Value(useSSL3Setting); | 713 FundamentalValue useSSL3Value(useSSL3Setting); |
710 web_ui_->CallJavascriptFunction( | 714 web_ui_->CallJavascriptFunction( |
711 "options.AdvancedOptions.SetUseSSL3CheckboxState", | 715 "options.AdvancedOptions.SetUseSSL3CheckboxState", |
712 useSSL3Value, disabledValue); | 716 useSSL3Value, disabledValue); |
713 FundamentalValue useTLS1Value(useTLS1Setting); | 717 FundamentalValue useTLS1Value(useTLS1Setting); |
714 web_ui_->CallJavascriptFunction( | 718 web_ui_->CallJavascriptFunction( |
715 "options.AdvancedOptions.SetUseTLS1CheckboxState", | 719 "options.AdvancedOptions.SetUseTLS1CheckboxState", |
716 useTLS1Value, disabledValue); | 720 useTLS1Value, disabledValue); |
717 } | 721 } |
718 #endif | 722 #endif |
OLD | NEW |