Switch to standard integer types in chrome/browser/chromeos/.

chrome/browser/chromeos/display/output_protection_delegate.cc

 // Copyright 2013 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/chromeos/display/output_protection_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "build/build_config.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/screen.h"
 
 namespace chromeos {
 
 namespace {
 
-bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64* display_id) {
+bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64_t* display_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(rfh);
   DCHECK(display_id);
 
   gfx::NativeView native_view = rfh->GetNativeView();
   gfx::Screen* screen = gfx::Screen::GetScreenFor(native_view);
   if (!screen)
     return false;
   gfx::Display display = screen->GetDisplayNearestWindow(native_view);
   *display_id = display.id();
@@ skipping 126 matching lines @@
 
 void OutputProtectionDelegate::OnWindowHierarchyChanged(
     const aura::WindowObserver::HierarchyChangeParams& params) {
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
   if (!rfh) {
     LOG(WARNING) << "RenderFrameHost is not alive.";
     return;
   }
 
-  int64 new_display_id = 0;
+  int64_t new_display_id = 0;
   if (!GetCurrentDisplayId(rfh, &new_display_id))
     return;
   if (display_id_ == new_display_id)
     return;
 
   if (desired_method_mask_ != ui::CONTENT_PROTECTION_METHOD_NONE) {
     // Display changed and should enable output protections on new display.
     ui::DisplayConfigurator* configurator =
         ash::Shell::GetInstance()->display_configurator();
     configurator->EnableContentProtection(GetClientId(), new_display_id,
                                           desired_method_mask_,
                                           base::Bind(&DoNothing));
     configurator->EnableContentProtection(GetClientId(), display_id_,
                                           ui::CONTENT_PROTECTION_METHOD_NONE,
                                           base::Bind(&DoNothing));
   }
   display_id_ = new_display_id;
 }
 
 void OutputProtectionDelegate::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(window, window_);
   window_->RemoveObserver(this);
   window_ = nullptr;
 }
 
 }  // namespace chromeos