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

Unified Diff: chrome/browser/ui/views/user_data_dir_dialog_view.h

Issue 10382155: browser: Refactor the way to show the user data dir dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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
Index: chrome/browser/ui/views/user_data_dir_dialog_view.h
diff --git a/chrome/browser/ui/views/user_data_dir_dialog.h b/chrome/browser/ui/views/user_data_dir_dialog_view.h
similarity index 58%
rename from chrome/browser/ui/views/user_data_dir_dialog.h
rename to chrome/browser/ui/views/user_data_dir_dialog_view.h
index 6dfb866dff71de85a343a7d67ca5d5e75d2a20e4..3167a1b1b5aa734d7b69037ffc6ddcc46d79b8eb 100644
--- a/chrome/browser/ui/views/user_data_dir_dialog.h
+++ b/chrome/browser/ui/views/user_data_dir_dialog_view.h
@@ -1,62 +1,55 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-//
-// A dialog box that tells the user that we can't write to the specified user
-// data directory. Provides the user a chance to pick a different directory.
-#ifndef CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_H_
-#define CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_VIEW_H_
#pragma once
#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/file_path.h"
#include "base/message_loop.h"
#include "chrome/browser/ui/select_file_dialog.h"
#include "ui/views/window/dialog_delegate.h"
-class FilePath;
-
namespace views {
class MessageBoxView;
}
-class UserDataDirDialog : public views::DialogDelegate,
- public MessageLoopForUI::Dispatcher,
- public SelectFileDialog::Listener {
+// A dialog box that tells the user that we can't write to the specified user
+// data directory. Provides the user a chance to pick a different directory.
+class UserDataDirDialogView : public views::DialogDelegate,
+ public MessageLoopForUI::Dispatcher,
+ public SelectFileDialog::Listener {
public:
- // Creates and runs a user data directory picker dialog. The method blocks
- // while the dialog is showing. If the user picks a directory, this method
- // returns the chosen directory. |user_data_dir| is the value of the
- // directory we were not able to use.
- static FilePath RunUserDataDirDialog(const FilePath& user_data_dir);
- virtual ~UserDataDirDialog();
+ explicit UserDataDirDialogView(const FilePath& user_data_dir);
+ virtual ~UserDataDirDialogView();
FilePath user_data_dir() const { return user_data_dir_; }
- // views::DialogDelegate methods:
+ // Overridden from views::DialogDelegate:
virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
virtual string16 GetWindowTitle() const OVERRIDE;
virtual void DeleteDelegate() OVERRIDE;
virtual bool Accept() OVERRIDE;
virtual bool Cancel() OVERRIDE;
- // views::WidgetDelegate methods:
+ // Overridden from views::WidgetDelegate:
virtual views::View* GetContentsView() OVERRIDE;
virtual views::Widget* GetWidget() OVERRIDE;
virtual const views::Widget* GetWidget() const OVERRIDE;
- // MessageLoop::Dispatcher method:
+ // Overridden from MessageLoopForUI::Dispatcher:
virtual bool Dispatch(const base::NativeEvent& msg) OVERRIDE;
- // SelectFileDialog::Listener methods:
+ // Overridden from SelectFileDialog::Listener:
virtual void FileSelected(const FilePath& path,
int index,
void* params) OVERRIDE;
virtual void FileSelectionCanceled(void* params) OVERRIDE;
private:
- explicit UserDataDirDialog(const FilePath& user_data_dir);
-
// Empty until the user picks a directory.
FilePath user_data_dir_;
@@ -67,7 +60,7 @@ class UserDataDirDialog : public views::DialogDelegate,
// waiting for the user to dismiss the dialog).
bool is_blocking_;
- DISALLOW_COPY_AND_ASSIGN(UserDataDirDialog);
+ DISALLOW_COPY_AND_ASSIGN(UserDataDirDialogView);
};
-#endif // CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_H_
+#endif // CHROME_BROWSER_UI_VIEWS_USER_DATA_DIR_DIALOG_VIEW_H_
« no previous file with comments | « chrome/browser/ui/views/user_data_dir_dialog.cc ('k') | chrome/browser/ui/views/user_data_dir_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698