MacViews: Refactor ShowConfirmBubble to also take a gfx::NativeWindow

chrome/browser/renderer_context_menu/spelling_menu_observer.cc

 // Copyright 2014 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/renderer_context_menu/spelling_menu_observer.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/prefs/pref_service.h"
@@ skipping 280 matching lines @@
   if (command_id == IDC_CONTENT_CONTEXT_SPELLING_TOGGLE &&
       integrate_spelling_service_.IsUserModifiable()) {
     // When a user enables the "Ask Google for spelling suggestions" item, we
     // show a bubble to confirm it. On the other hand, when a user disables this
     // item, we directly update/ the profile and stop integrating the spelling
     // service immediately.
     if (!integrate_spelling_service_.GetValue()) {
       content::RenderViewHost* rvh = proxy_->GetRenderViewHost();
       gfx::Rect rect = rvh->GetView()->GetViewBounds();
       chrome::ShowConfirmBubble(
-#if defined(TOOLKIT_VIEWS)
           proxy_->GetWebContents()->GetTopLevelNativeWindow(),
-#else
           rvh->GetView()->GetNativeView(),
-#endif
           gfx::Point(rect.CenterPoint().x(), rect.y()),
           new SpellingBubbleModel(proxy_->GetProfile(),
                                   proxy_->GetWebContents(),
                                   false));
     } else {
       Profile* profile = proxy_->GetProfile();
       if (profile) {
         profile->GetPrefs()->SetBoolean(prefs::kSpellCheckUseSpellingService,
                                         false);
         profile->GetPrefs()->SetBoolean(prefs::kEnableAutoSpellCorrect,
                                         false);
       }
     }
   }
   // Autocorrect requires use of the spelling service and the spelling service
   // can be toggled by the user only if it is not managed.
   if (command_id == IDC_CONTENT_CONTEXT_AUTOCORRECT_SPELLING_TOGGLE &&
       integrate_spelling_service_.IsUserModifiable()) {
     // When the user enables autocorrect, we'll need to make sure that we can
     // ask Google for suggestions since that service is required. So we show
     // the bubble and just make sure to enable autocorrect as well.
     if (!integrate_spelling_service_.GetValue()) {
       content::RenderViewHost* rvh = proxy_->GetRenderViewHost();
       gfx::Rect rect = rvh->GetView()->GetViewBounds();
-      chrome::ShowConfirmBubble(rvh->GetView()->GetNativeView(),
-                                gfx::Point(rect.CenterPoint().x(), rect.y()),
-                                new SpellingBubbleModel(
-                                    proxy_->GetProfile(),
-                                    proxy_->GetWebContents(),
-                                    true));
+      chrome::ShowConfirmBubble(
+          proxy_->GetWebContents()->GetTopLevelNativeWindow(),
+          rvh->GetView()->GetNativeView(),
+          gfx::Point(rect.CenterPoint().x(), rect.y()),
+          new SpellingBubbleModel(proxy_->GetProfile(),
+                                  proxy_->GetWebContents(),
+                                  true));
     } else {
       Profile* profile = proxy_->GetProfile();
       if (profile) {
         bool current_value = autocorrect_spelling_.GetValue();
         profile->GetPrefs()->SetBoolean(prefs::kEnableAutoSpellCorrect,
                                         !current_value);
       }
     }
   }
 }
@@ skipping 55 matching lines @@
   // Append '.' characters to the end of "Checking".
   loading_frame_ = (loading_frame_ + 1) & 3;
   base::string16 loading_message =
       loading_message_ + base::string16(loading_frame_,'.');
 
   // Update the menu item with the text. We disable this item to prevent users
   // from selecting it.
   proxy_->UpdateMenuItem(IDC_CONTENT_CONTEXT_SPELLING_SUGGESTION, false, false,
                          loading_message);
 }