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

Unified Diff: ui/base/dialogs/base_shell_dialog_win.cc

Issue 10698168: Part 3 of Move SelectFileDialog implementation to ui/base/dialogs/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More namespace to force rebuild. 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/base/dialogs/base_shell_dialog_win.h ('k') | ui/base/dialogs/select_file_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dialogs/base_shell_dialog_win.cc
diff --git a/chrome/browser/ui/views/base_shell_dialog_win.cc b/ui/base/dialogs/base_shell_dialog_win.cc
similarity index 95%
rename from chrome/browser/ui/views/base_shell_dialog_win.cc
rename to ui/base/dialogs/base_shell_dialog_win.cc
index ffb77ea721a10352f23f14cbb9952c7de74262a5..077a8a18913578ef6ec65e1ddb34addc94eaf439 100644
--- a/chrome/browser/ui/views/base_shell_dialog_win.cc
+++ b/ui/base/dialogs/base_shell_dialog_win.cc
@@ -2,15 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/views/base_shell_dialog_win.h"
+#include "ui/base/dialogs/base_shell_dialog_win.h"
#include <algorithm>
#include "base/threading/thread.h"
+namespace {
+
// Helpers to show certain types of Windows shell dialogs in a way that doesn't
// block the UI of the entire app.
-
class ShellDialogThread : public base::Thread {
public:
ShellDialogThread() : base::Thread("Chrome_ShellDialogThread") { }
@@ -40,6 +41,10 @@ void ShellDialogThread::CleanUp() {
CoUninitialize();
}
+} // namespace
+
+namespace ui {
+
// static
BaseShellDialogImpl::Owners BaseShellDialogImpl::owners_;
int BaseShellDialogImpl::instance_count_ = 0;
@@ -102,3 +107,5 @@ void BaseShellDialogImpl::EnableOwner(HWND owner) {
if (IsWindow(owner))
EnableWindow(owner, TRUE);
}
+
+} // namespace ui
« no previous file with comments | « ui/base/dialogs/base_shell_dialog_win.h ('k') | ui/base/dialogs/select_file_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698