Simplify ViewsDelegate subclasses by defining "base" versions of functions in
the base class.
Also a few other misc. cleanup bits, viz. DISALLOW_COPY_AND_ASSIGN, correct
class member declaration order, fix unreachable code, formatting tweaks.
BUG=none
TEST=none
[email protected]
Review URL: https://codereview.chromium.org/244033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265079 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index e01171a..7c77df2 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -51,6 +51,9 @@
#include "chrome/browser/ui/ash/ash_util.h"
#endif
+
+// Helpers --------------------------------------------------------------------
+
namespace {
Profile* GetProfileForWindow(const views::Widget* window) {
@@ -77,8 +80,14 @@
} // namespace
-///////////////////////////////////////////////////////////////////////////////
-// ChromeViewsDelegate, views::ViewsDelegate implementation:
+
+// ChromeViewsDelegate --------------------------------------------------------
+
+ChromeViewsDelegate::ChromeViewsDelegate() {
+}
+
+ChromeViewsDelegate::~ChromeViewsDelegate() {
+}
void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
const std::string& window_name,
@@ -181,14 +190,13 @@
}
#endif
+#if defined(USE_ASH)
views::NonClientFrameView* ChromeViewsDelegate::CreateDefaultNonClientFrameView(
views::Widget* widget) {
-#if defined(USE_ASH)
- if (chrome::IsNativeViewInAsh(widget->GetNativeView()))
- return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
-#endif
- return NULL;
+ return chrome::IsNativeViewInAsh(widget->GetNativeView()) ?
+ ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget) : NULL;
}
+#endif
void ChromeViewsDelegate::AddRef() {
g_browser_process->AddRefModule();
@@ -198,12 +206,6 @@
g_browser_process->ReleaseModule();
}
-content::WebContents* ChromeViewsDelegate::CreateWebContents(
- content::BrowserContext* browser_context,
- content::SiteInstance* site_instance) {
- return NULL;
-}
-
void ChromeViewsDelegate::OnBeforeWidgetInit(
views::Widget::InitParams* params,
views::internal::NativeWidgetDelegate* delegate) {
@@ -311,21 +313,14 @@
#endif
}
-base::TimeDelta
-ChromeViewsDelegate::GetDefaultTextfieldObscuredRevealDuration() {
- return base::TimeDelta();
-}
-
-bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
// On Ubuntu Unity, the system always provides a title bar for maximized
// windows.
views::LinuxUI* ui = views::LinuxUI::instance();
return maximized && ui && ui->UnityIsRunning();
-#endif
-
- return false;
}
+#endif
#if !defined(USE_AURA) && !defined(USE_CHROMEOS)
views::Widget::InitParams::WindowOpacity
