MacViews: Get chrome/browser/ui/views/frame to compile

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 90 matching lines @@
 #include "components/app_modal_dialogs/app_modal_dialog.h"
 #include "components/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/app/resources/grit/content_resources.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "grit/theme_resources.h"
 #include "ui/accessibility/ax_view_state.h"
-#include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_tree_host.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/screen.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
+#if defined(USE_AURA)
+#include "ui/aura/client/window_tree_client.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
+#endif
+
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/views/win/scoped_fullscreen_visibility.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/sync/one_click_signin_bubble_delegate.h"
 #include "chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.h"
 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
@@ skipping 1220 matching lines @@
 }
 
 void BrowserView::Copy() {
   DoCutCopyPaste(&content::WebContents::Copy, IDS_APP_COPY);
 }
 
 void BrowserView::Paste() {
   DoCutCopyPaste(&content::WebContents::Paste, IDS_APP_PASTE);
 }
 
+#if defined(OS_MACOSX)
+void BrowserView::EnterFullscreenWithChrome() {
+  NOTIMPLEMENTED();
+}
+
+void BrowserView::EnterFullscreenWithoutChrome() {
+  NOTIMPLEMENTED();
+}
+
+bool BrowserView::IsFullscreenWithChrome() {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool BrowserView::IsFullscreenWithoutChrome() {
+  NOTIMPLEMENTED();
+  return false;
+}
+#endif
+
 WindowOpenDisposition BrowserView::GetDispositionForPopupBounds(
     const gfx::Rect& bounds) {
   return NEW_POPUP;
 }
 
 FindBar* BrowserView::CreateFindBar() {
   return chrome::CreateFindBar(this);
 }
 
 WebContentsModalDialogHost* BrowserView::GetWebContentsModalDialogHost() {
@@ skipping 18 matching lines @@
 ToolbarView* BrowserView::GetToolbarView() const {
   return toolbar_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserView, TabStripModelObserver implementation:
 
 void BrowserView::TabInsertedAt(WebContents* contents,
                                 int index,
                                 bool foreground) {
+#if defined(USE_AURA)

[tapted, 2014/11/04 02:33:42]

We'll likely need something here for Mac.. (and it might need objective C). This
would, e.g., ensure the renderer is using the correct display scale factor once
it knows what kind of NSScreen it's going to be drawn on.

One way to avoid the #ifdefs might be frame()->OnTabInserted(contents)

BrowserFrame::OnTabInserted(WebContents* contents) { 
  native_browser_frame_->OnTabInserted(contents);
}

BrowserFrameAura::OnTabInserted(WebContents* contents) {
  /* .. */
}

that's a big thread to pull though.

[Andre, 2014/11/05 02:04:23]

The problem is that we will need this code in both BrowserFrameAsh and
DesktopBrowserFrameAura (right?).
I didn't see a nice way to avoid duplicating the code.
WebContentsViewAura may be a better place for this, since its CreateView has
related code.
I'm not sure we will need this for Mac, because we have other hooks such as
viewDidMoveToWindow.
WDYT?

[tapted, 2014/11/05 05:00:47]

yeah - it looks tricky to get BrowserFrameAsh/Aura sharing base class without
crazy injection tricks. Creating a hierarchy off NativeBrowserFrame (i.e.
NativeBrowserFrameAura/NativeBrowserFrameMac) should work instead... but it
raises some multiple-inheritance red-flags.

But if Mac is functional with this #ifdef'd out, then it should be OK like this.

   // WebContents inserted in tabs might not have been added to the root
   // window yet. Per http://crbug/342672 add them now since drawing the
   // WebContents requires root window specific data - information about
   // the screen the WebContents is drawn on, for example.
   if (!contents->GetNativeView()->GetRootWindow()) {
     aura::Window* window = contents->GetNativeView();
     aura::Window* root_window = GetNativeWindow()->GetRootWindow();
     aura::client::ParentWindowWithContext(
         window, root_window, root_window->GetBoundsInScreen());
     DCHECK(contents->GetNativeView()->GetRootWindow());
   }
+#endif
   web_contents_close_handler_->TabInserted();
 
   if (foreground)
     extensions::MaybeShowExtensionControlledNewTabPage(browser(), contents);
 }
 
 void BrowserView::TabDetachedAt(WebContents* contents, int index) {
   if (PermissionBubbleManager::FromWebContents(contents))
     PermissionBubbleManager::FromWebContents(contents)->SetView(NULL);
 
@@ skipping 919 matching lines @@
       else if (key_code == ui::VKEY_K)
         content::RecordAction(UserMetricsAction("Accel_FocusSearch_K"));
       break;
     default:
       // Do nothing.
       break;
   }
 #endif
 }
 
-// static
-BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
-  // Create the view and the frame. The frame will attach itself via the view
-  // so we don't need to do anything with the pointer.
-  BrowserView* view = new BrowserView();
-  view->Init(browser);
-  (new BrowserFrame(view))->InitBrowserFrame();
-  view->GetWidget()->non_client_view()->SetAccessibleName(
-      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
-  return view;
-}
-
-// static
-chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(
-    chrome::HostDesktopType desktop_type) {
-  return NativeBrowserFrameFactory::AdjustHostDesktopType(desktop_type);
-}
-
 void BrowserView::ShowAvatarBubble(WebContents* web_contents,
                                    const gfx::Rect& rect) {
   gfx::Point origin(rect.origin());
   views::View::ConvertPointToScreen(GetTabContentsContainerView(), &origin);
   gfx::Rect bounds(origin, rect.size());
 
   AvatarMenuBubbleView::ShowBubble(
       this, views::BubbleBorder::TOP_RIGHT, views::BubbleBorder::PAINT_NORMAL,
       views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE, bounds, browser_.get());
 }
@@ skipping 73 matching lines @@
       (!strcmp(focused->GetClassName(), views::Textfield::kViewClassName) ||
        !strcmp(focused->GetClassName(), OmniboxViewViews::kViewClassName))) {
     views::Textfield* textfield = static_cast<views::Textfield*>(focused);
     textfield->ExecuteCommand(command_id);
   }
 }
 
 bool BrowserView::DoCutCopyPasteForWebContents(
     WebContents* contents,
     void (WebContents::*method)()) {
-  gfx::NativeView native_view = contents->GetContentNativeView();
-  if (!native_view)
-    return false;
-  if (native_view->HasFocus()) {
+  if (contents->GetRenderWidgetHostView()->HasFocus()) {
     (contents->*method)();
     return true;
   }
 
   return false;
 }
 
 void BrowserView::ActivateAppModalDialog() const {
   // If another browser is app modal, flash and activate the modal browser.
   AppModalDialog* active_dialog =
@@ skipping 19 matching lines @@
       !GetLocationBar()->GetOmniboxView()->model()->popup_model()->IsOpen()) {
     gfx::Point icon_bottom(
         toolbar_->location_bar()->GetLocationBarAnchorPoint());
     ConvertPointToTarget(toolbar_->location_bar(), this, &icon_bottom);
     gfx::Point infobar_top(0, infobar_container_->GetVerticalOverlap(NULL));
     ConvertPointToTarget(infobar_container_, this, &infobar_top);
     top_arrow_height = infobar_top.y() - icon_bottom.y();
   }
   return top_arrow_height;
 }
+
+#if !defined(OS_MACOSX) || defined(MAC_VIEWS_BROWSER)
+// static
+BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {

[tapted, 2014/11/04 02:33:43]

move these to browser_window_factory.cc?

[Andre, 2014/11/05 02:04:23]

Done.

+  // Create the view and the frame. The frame will attach itself via the view
+  // so we don't need to do anything with the pointer.
+  BrowserView* view = new BrowserView();
+  view->Init(browser);
+  (new BrowserFrame(view))->InitBrowserFrame();
+  view->GetWidget()->non_client_view()->SetAccessibleName(
+      l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
+  return view;
+}
+
+// static
+chrome::HostDesktopType BrowserWindow::AdjustHostDesktopType(
+    chrome::HostDesktopType desktop_type) {
+  return NativeBrowserFrameFactory::AdjustHostDesktopType(desktop_type);
+}
+#endif