| Index: chrome/browser/modal_dialog_lock.h
|
| diff --git a/chrome/browser/modal_dialog_lock.h b/chrome/browser/modal_dialog_lock.h
|
| index f04756ff1f71fa6b22f73f7a9b7657c044f3b674..94d7ae8676c15ceb6c19ee1e97f607af3278454d 100644
|
| --- a/chrome/browser/modal_dialog_lock.h
|
| +++ b/chrome/browser/modal_dialog_lock.h
|
| @@ -1,52 +1,52 @@
|
| -// Copyright (c) 2013 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.
|
| -
|
| -#ifndef CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
| -#define CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
| -
|
| -#include "base/basictypes.h"
|
| -#include "chrome/browser/process_singleton.h"
|
| -#include "ui/gfx/native_widget_types.h"
|
| -
|
| -class CommandLine;
|
| -
|
| -namespace base {
|
| -class FilePath;
|
| -}
|
| -
|
| -// Implements a ProcessSingleton::NotificationCallback that prevents
|
| -// command-line handling when a modal dialog is active.
|
| -//
|
| -// While a dialog is active, the ProcessSingleton notification
|
| -// callback will handle but ignore notifications (i.e., neither this process
|
| -// nor the invoking process will handle the command line) and the dialog is
|
| -// brought to the foreground.
|
| -//
|
| -// Otherwise, the notification is forwarded to a wrapped NotificationCallback.
|
| -class ModalDialogLock {
|
| - public:
|
| - explicit ModalDialogLock(
|
| - const ProcessSingleton::NotificationCallback& original_callback);
|
| - ~ModalDialogLock();
|
| -
|
| - // Receives a handle to the active modal dialog, or NULL if the active dialog
|
| - // is dismissed.
|
| - void SetActiveModalDialog(gfx::NativeWindow active_dialog);
|
| -
|
| - // Returns the callback that should be supplied to ProcessSingleton.
|
| - // The callback is only valid during the lifetime of the ModalDialogLock
|
| - // instance.
|
| - ProcessSingleton::NotificationCallback AsNotificationCallback();
|
| -
|
| - private:
|
| - bool NotificationCallbackImpl(const CommandLine& command_line,
|
| - const base::FilePath& current_directory);
|
| -
|
| - gfx::NativeWindow active_dialog_;
|
| - ProcessSingleton::NotificationCallback original_callback_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(ModalDialogLock);
|
| -};
|
| -
|
| -#endif // CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
| +// Copyright (c) 2013 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.
|
| +
|
| +#ifndef CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
| +#define CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
| +
|
| +#include "base/basictypes.h"
|
| +#include "chrome/browser/process_singleton.h"
|
| +#include "ui/gfx/native_widget_types.h"
|
| +
|
| +class CommandLine;
|
| +
|
| +namespace base {
|
| +class FilePath;
|
| +}
|
| +
|
| +// Implements a ProcessSingleton::NotificationCallback that prevents
|
| +// command-line handling when a modal dialog is active.
|
| +//
|
| +// While a dialog is active, the ProcessSingleton notification
|
| +// callback will handle but ignore notifications (i.e., neither this process
|
| +// nor the invoking process will handle the command line) and the dialog is
|
| +// brought to the foreground.
|
| +//
|
| +// Otherwise, the notification is forwarded to a wrapped NotificationCallback.
|
| +class ModalDialogLock {
|
| + public:
|
| + explicit ModalDialogLock(
|
| + const ProcessSingleton::NotificationCallback& original_callback);
|
| + ~ModalDialogLock();
|
| +
|
| + // Receives a handle to the active modal dialog, or NULL if the active dialog
|
| + // is dismissed.
|
| + void SetActiveModalDialog(gfx::NativeWindow active_dialog);
|
| +
|
| + // Returns the callback that should be supplied to ProcessSingleton.
|
| + // The callback is only valid during the lifetime of the ModalDialogLock
|
| + // instance.
|
| + ProcessSingleton::NotificationCallback AsNotificationCallback();
|
| +
|
| + private:
|
| + bool NotificationCallbackImpl(const CommandLine& command_line,
|
| + const base::FilePath& current_directory);
|
| +
|
| + gfx::NativeWindow active_dialog_;
|
| + ProcessSingleton::NotificationCallback original_callback_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(ModalDialogLock);
|
| +};
|
| +
|
| +#endif // CHROME_BROWSER_MODAL_DIALOG_LOCK_H_
|
|
|