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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_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/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/base64.h" 8 #include "base/base64.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 } 726 }
727 727
728 void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage( 728 void ExtensionSettingsHandler::HandleLoadUnpackedExtensionMessage(
729 const ListValue* args) { 729 const ListValue* args) {
730 DCHECK(args->empty()); 730 DCHECK(args->empty());
731 731
732 string16 select_title = 732 string16 select_title =
733 l10n_util::GetStringUTF16(IDS_EXTENSION_LOAD_FROM_DIRECTORY); 733 l10n_util::GetStringUTF16(IDS_EXTENSION_LOAD_FROM_DIRECTORY);
734 734
735 const int kFileTypeIndex = 0; // No file type information to index. 735 const int kFileTypeIndex = 0; // No file type information to index.
736 const SelectFileDialog::Type kSelectType = SelectFileDialog::SELECT_FOLDER; 736 const ui::SelectFileDialog::Type kSelectType =
737 load_extension_dialog_ = SelectFileDialog::Create( 737 ui::SelectFileDialog::SELECT_FOLDER;
738 load_extension_dialog_ = ui::SelectFileDialog::Create(
738 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents())); 739 this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
739 load_extension_dialog_->SelectFile( 740 load_extension_dialog_->SelectFile(
740 kSelectType, select_title, last_unpacked_directory_, NULL, 741 kSelectType, select_title, last_unpacked_directory_, NULL,
741 kFileTypeIndex, FILE_PATH_LITERAL(""), 742 kFileTypeIndex, FILE_PATH_LITERAL(""),
742 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL); 743 web_ui()->GetWebContents()->GetView()->GetTopLevelNativeWindow(), NULL);
743 } 744 }
744 745
745 void ExtensionSettingsHandler::ShowAlert(const std::string& message) { 746 void ExtensionSettingsHandler::ShowAlert(const std::string& message) {
746 ListValue arguments; 747 ListValue arguments;
747 arguments.Append(Value::CreateStringValue(message)); 748 arguments.Append(Value::CreateStringValue(message));
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 return extension_uninstall_dialog_.get(); 877 return extension_uninstall_dialog_.get();
877 #else 878 #else
878 return NULL; 879 return NULL;
879 #endif // !defined(OS_ANDROID) 880 #endif // !defined(OS_ANDROID)
880 } 881 }
881 882
882 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) { 883 void ExtensionSettingsHandler::InspectExtensionHost(ExtensionHost* host) {
883 if (host) 884 if (host)
884 DevToolsWindow::OpenDevToolsWindow(host->render_view_host()); 885 DevToolsWindow::OpenDevToolsWindow(host->render_view_host());
885 } 886 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698