| Index: chrome/browser/ui/dialog_style.h
|
| diff --git a/chrome/browser/chromeos/frame/bubble_window_style.h b/chrome/browser/ui/dialog_style.h
|
| similarity index 68%
|
| copy from chrome/browser/chromeos/frame/bubble_window_style.h
|
| copy to chrome/browser/ui/dialog_style.h
|
| index 44073715555af2b479f5ad0184edb8b027fb1de4..31299ca1110a4ea40b752fca56b01ef15255c426 100644
|
| --- a/chrome/browser/chromeos/frame/bubble_window_style.h
|
| +++ b/chrome/browser/ui/dialog_style.h
|
| @@ -2,21 +2,22 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_WINDOW_STYLE_H_
|
| -#define CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_WINDOW_STYLE_H_
|
| +#ifndef CHROME_BROWSER_UI_DIALOG_STYLE_H_
|
| +#define CHROME_BROWSER_UI_DIALOG_STYLE_H_
|
| #pragma once
|
|
|
| #include "third_party/skia/include/core/SkColor.h"
|
|
|
| -namespace chromeos {
|
| -
|
| // A class to share common definitions between GTK and Views implementations.
|
| -enum BubbleWindowStyle {
|
| +enum DialogStyle {
|
| // Default style.
|
| STYLE_GENERIC = 0,
|
|
|
| +#if defined(OS_CHROMEOS)
|
| // Show close button at the top right (left for RTL).
|
| // Deprecated, see BubbleWindow::Create().
|
| + // TODO(bshe): We probably need to use this style for certificate viewer
|
| + // HTML dialog.
|
| STYLE_XBAR = 1 << 0,
|
|
|
| // Show throbber for slow rendering.
|
| @@ -25,10 +26,8 @@ enum BubbleWindowStyle {
|
|
|
| // Content flush to edge, no padding.
|
| STYLE_FLUSH = 1 << 2
|
| -};
|
| +#endif
|
|
|
| -extern const SkColor kBubbleWindowBackgroundColor;
|
| -
|
| -} // namespace chromeos
|
| +};
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_FRAME_BUBBLE_WINDOW_STYLE_H_
|
| +#endif // CHROME_BROWSER_UI_DIALOG_STYLE_H_
|
|
|