Remove more ifdefs and TODOs that were added for Aura Android

ui/views/widget/android/native_widget_android.cc

 // Copyright 2015 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 "ui/views/widget/android/native_widget_android.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_client.h"
 #include "ui/wm/public/dispatcher_client.h"
 #include "ui/wm/public/drag_drop_client.h"
 #include "ui/wm/public/window_move_client.h"
 #include "ui/wm/public/window_types.h"
 
-// TODO(bshe): Most of the code is copied from NativeWidgetAura or
-// DesktopNativeWidgetAura. Share more code instead of duplicate code when
-// possible. crbug.com/554961.
 namespace {
 
 class WindowTreeClientImpl : public aura::client::WindowTreeClient {
  public:
   explicit WindowTreeClientImpl(aura::Window* root_window)
       : root_window_(root_window) {
     aura::client::SetWindowTreeClient(root_window_, this);
   }
   ~WindowTreeClientImpl() override {
     aura::client::SetWindowTreeClient(root_window_, nullptr);
@@ skipping 66 matching lines @@
 
 void NativeWidgetAndroid::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   NativeWidgetAura::RegisterNativeWidgetForWindow(this, window_);
 
   window_->SetType(GetAuraWindowTypeForWidgetType(params.type));
   window_->Init(params.layer_type);
   wm::SetShadowType(window_, wm::SHADOW_TYPE_NONE);
   window_->Show();
 
-  // TODO(bshe): Get rid of the hard coded size. Tracked in crbug.com/551923.
   host_.reset(aura::WindowTreeHost::Create(gfx::Rect(0, 0, 800, 600)));
   host_->InitHost();
   host_->AddObserver(this);
 
   window_tree_client_.reset(new WindowTreeClientImpl(host_->window()));
 
   focus_client_.reset(new wm::FocusController(new AndroidFocusRules));
   aura::client::SetFocusClient(host_->window(), focus_client_.get());
   host_->window()->AddPreTargetHandler(focus_client_.get());
 
@@ skipping 17 matching lines @@
   if (params.type != Widget::InitParams::TYPE_TOOLTIP &&
       params.type != Widget::InitParams::TYPE_POPUP) {
     aura::client::SetDragDropDelegate(window_, this);
   }
 
   aura::client::SetActivationDelegate(window_, this);
 
   host_->window()->AddChild(window_);
   window_reorderer_.reset(
       new WindowReorderer(window_, GetWidget()->GetRootView()));
-
-  // TODO(bshe): figure out how to add cursor manager, drag drop client and all
-  // the necessary parts that exists in desktop_native_widget_aura.
 }
 
 NonClientFrameView* NativeWidgetAndroid::CreateNonClientFrameView() {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 bool NativeWidgetAndroid::ShouldUseNativeFrame() const {
   // There is only one frame type for aura.
   return false;
@@ skipping 34 matching lines @@
 
 const ui::Layer* NativeWidgetAndroid::GetLayer() const {
   return GetNativeWindow()->layer();
 }
 
 void NativeWidgetAndroid::ReorderNativeViews() {
   window_reorderer_->ReorderChildWindows();
 }
 
 void NativeWidgetAndroid::ViewRemoved(View* view) {
-  // TODO(bshe): Implement drag and drop. crbug.com/554029.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::SetNativeWindowProperty(const char* name,
                                                   void* value) {
   GetNativeWindow()->SetNativeWindowProperty(name, value);
 }
 
 void* NativeWidgetAndroid::GetNativeWindowProperty(const char* name) const {
   return GetNativeWindow()->GetNativeWindowProperty(name);
@@ skipping 13 matching lines @@
 
 bool NativeWidgetAndroid::HasCapture() const {
   return GetNativeWindow()->HasCapture();
 }
 
 ui::InputMethod* NativeWidgetAndroid::GetInputMethod() {
   return host_->GetInputMethod();
 }
 
 void NativeWidgetAndroid::CenterWindow(const gfx::Size& size) {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAndroid::SetWindowTitle(const base::string16& title) {
   if (GetNativeWindow()->title() == title)
     return false;
   GetNativeWindow()->SetTitle(title);
   return true;
 }
 
 void NativeWidgetAndroid::SetWindowIcons(const gfx::ImageSkia& window_icon,
                                          const gfx::ImageSkia& app_icon) {
-  // TODO(bshe): Implement this. See crbug.com/554953.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::InitModalType(ui::ModalType modal_type) {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 gfx::Rect NativeWidgetAndroid::GetWindowBoundsInScreen() const {
   return GetNativeWindow()->GetBoundsInScreen();
 }
 
 gfx::Rect NativeWidgetAndroid::GetClientAreaBoundsInScreen() const {
   // View-to-screen coordinate system transformations depend on this returning
   // the full window bounds, for example View::ConvertPointToScreen().
   return GetNativeWindow()->GetBoundsInScreen();
 }
 
 gfx::Rect NativeWidgetAndroid::GetRestoredBounds() const {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 void NativeWidgetAndroid::SetBounds(const gfx::Rect& bounds) {
-  // TODO(bshe): This may not work. We may need to resize SurfaceView too. See
-  // crbug.com/554952.
   host_->SetBounds(bounds);
 }
 
 void NativeWidgetAndroid::SetSize(const gfx::Size& size) {
   gfx::Rect bounds = host_->GetBounds();
   SetBounds(gfx::Rect(bounds.origin(), size));
 }
 
 void NativeWidgetAndroid::StackAbove(gfx::NativeView native_view) {
-  // TODO(bshe): Implements window stacking logic. See crbug.com/554047
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::StackAtTop() {
-  // TODO(bshe): Implements window stacking logic. See crbug.com/554047
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::StackBelow(gfx::NativeView native_view) {
-  // TODO(bshe): Implements window stacking logic. See crbug.com/554047
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::SetShape(SkRegion* region) {
   GetNativeWindow()->layer()->SetAlphaShape(make_scoped_ptr(region));
 }
 
 void NativeWidgetAndroid::Close() {
-  // TODO(bshe): This might not be right. See crbug.com/554259.
   DCHECK(ownership_ == Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET);
   GetNativeWindow()->SuppressPaint();
   Hide();
   GetNativeWindow()->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_NONE);
 
   if (!close_widget_factory_.HasWeakPtrs()) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&NativeWidgetAndroid::CloseNow,
                               close_widget_factory_.GetWeakPtr()));
   }
 }
 
 void NativeWidgetAndroid::CloseNow() {
-  // TODO(bshe): This might not be right. See crbug.com/554259.
   host_->RemoveObserver(this);
   host_.reset();
   delete window_;
 }
 
 void NativeWidgetAndroid::Show() {
   host_->Show();
   GetNativeWindow()->Show();
 }
 
@@ skipping 31 matching lines @@
 
 void NativeWidgetAndroid::SetAlwaysOnTop(bool on_top) {
   GetNativeWindow()->SetProperty(aura::client::kAlwaysOnTopKey, on_top);
 }
 
 bool NativeWidgetAndroid::IsAlwaysOnTop() const {
   return GetNativeWindow()->GetProperty(aura::client::kAlwaysOnTopKey);
 }
 
 void NativeWidgetAndroid::SetVisibleOnAllWorkspaces(bool always_visible) {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::Maximize() {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::Minimize() {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAndroid::IsMaximized() const {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
   return false;
 }
 
 bool NativeWidgetAndroid::IsMinimized() const {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
   return false;
 }
 
 void NativeWidgetAndroid::Restore() {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::SetFullscreen(bool fullscreen) {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAndroid::IsFullscreen() const {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
   return false;
 }
 
 void NativeWidgetAndroid::SetOpacity(unsigned char opacity) {
   GetNativeWindow()->layer()->SetOpacity(opacity / 255.0);
 }
 
 void NativeWidgetAndroid::SetUseDragFrame(bool use_drag_frame) {
   NOTIMPLEMENTED();
@@ skipping 39 matching lines @@
 gfx::Rect NativeWidgetAndroid::GetWorkAreaBoundsInScreen() const {
   return gfx::Screen::GetScreenFor(window_)
       ->GetDisplayNearestWindow(window_)
       .work_area();
 }
 
 Widget::MoveLoopResult NativeWidgetAndroid::RunMoveLoop(
     const gfx::Vector2d& drag_offset,
     Widget::MoveLoopSource source,
     Widget::MoveLoopEscapeBehavior escape_behavior) {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
   return Widget::MOVE_LOOP_SUCCESSFUL;
 }
 
 void NativeWidgetAndroid::EndMoveLoop() {
-  // TODO(bshe): Implement this. See crbug.com/554208.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAndroid::SetVisibilityChangedAnimationsEnabled(bool value) {
   GetNativeWindow()->SetProperty(aura::client::kAnimationsDisabledKey, !value);
 }
 
 void NativeWidgetAndroid::SetVisibilityAnimationDuration(
     const base::TimeDelta& duration) {
   wm::SetWindowVisibilityAnimationDuration(GetNativeWindow(), duration);
@@ skipping 234 matching lines @@
   if (window_ == gained_focus)
     delegate_->OnNativeFocus();
   else if (window_ == lost_focus)
     delegate_->OnNativeBlur();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAndroid, aura::WindowDragDropDelegate implementation:
 
 void NativeWidgetAndroid::OnDragEntered(const ui::DropTargetEvent& event) {
-  // TODO: Implement drag and drop. crbug.com/554029.
   NOTIMPLEMENTED();
 }
 
 int NativeWidgetAndroid::OnDragUpdated(const ui::DropTargetEvent& event) {
-  // TODO: Implement drag and drop. crbug.com/554029.
   NOTIMPLEMENTED();
   return 0;
 }
 
 void NativeWidgetAndroid::OnDragExited() {
-  // TODO: Implement drag and drop. crbug.com/554029.
   NOTIMPLEMENTED();
 }
 
 int NativeWidgetAndroid::OnPerformDrop(const ui::DropTargetEvent& event) {

[sky, 2016/01/19 17:05:20]

Should we remove this file entirely?

-  // TODO: Implement drag and drop. crbug.com/554029.
   NOTIMPLEMENTED();
   return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAndroid, aura::WindowTreeHostObserver implementation:
 
 void NativeWidgetAndroid::OnHostCloseRequested(
     const aura::WindowTreeHost* host) {
   GetWidget()->Close();
@@ skipping 32 matching lines @@
   return false;
 }
 
 void NativeWidgetAndroid::SetInitialFocus(ui::WindowShowState show_state) {
   // The window does not get keyboard messages unless we focus it.
   if (!GetWidget()->SetInitialFocus(show_state))
     window_->Focus();
 }
 
 }  // namespace views