Variety of tweaks to View API.

chrome/browser/automation/testing_automation_provider_views.cc

 // Copyright (c) 2011 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/automation/testing_automation_provider.h"
 
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_window_tracker.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 39 matching lines @@
         FROM_HERE,
         method_factory_.NewRunnableMethod(
             &ViewFocusChangeWaiter::FocusChanged,
             focused_before,
             focused_now));
   }
 
  private:
   void FocusChanged(views::View* focused_before,
                     views::View* focused_now) {
-    if (focused_now && focused_now->GetID() != previous_view_id_) {
+    if (focused_now && focused_now->id() != previous_view_id_) {
       AutomationMsg_WaitForFocusedViewIDToChange::WriteReplyParams(
-          reply_message_, true, focused_now->GetID());
+          reply_message_, true, focused_now->id());
 
       automation_->Send(reply_message_);
       delete this;
     }
   }
 
   views::FocusManager* focus_manager_;
   int previous_view_id_;
   AutomationProvider* automation_;
   IPC::Message* reply_message_;
@@ skipping 69 matching lines @@
 
 void TestingAutomationProvider::GetFocusedViewID(int handle, int* view_id) {
   *view_id = -1;
   if (window_tracker_->ContainsHandle(handle)) {
     gfx::NativeWindow window = window_tracker_->GetResource(handle);
     views::FocusManager* focus_manager =
         views::FocusManager::GetFocusManagerForNativeWindow(window);
     DCHECK(focus_manager);
     views::View* focused_view = focus_manager->GetFocusedView();
     if (focused_view)
-      *view_id = focused_view->GetID();
+      *view_id = focused_view->id();
   }
 }
 
 void TestingAutomationProvider::WaitForFocusedViewIDToChange(
     int handle, int previous_view_id, IPC::Message* reply_message) {
   if (!window_tracker_->ContainsHandle(handle))
     return;
   gfx::NativeWindow window = window_tracker_->GetResource(handle);
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManagerForNativeWindow(window);
@@ skipping 26 matching lines @@
           reply_message, true);
     Send(reply_message);
     return;
   }
 
   // Otherwise, register this reply message with the waiter,
   // which will handle responding to this IPC when the popup
   // menu opens.
   popup_menu_waiter_->set_reply_message(reply_message);
 }