Remove app/win/win_util.h,cc etc.

chrome/browser/ui/cocoa/bug_report_window_controller.mm

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #import "chrome/browser/ui/cocoa/bug_report_window_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bug_report_util.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 @implementation BugReportWindowController
 
 @synthesize bugDescription = bugDescription_;
 @synthesize bugTypeIndex = bugTypeIndex_;
 @synthesize pageURL = pageURL_;
@@ skipping 12 matching lines @@
 
     // The order of strings in this array must match the order of the bug types
     // declared below in the bugTypeFromIndex function.
     bugTypeList_ = [[NSMutableArray alloc] initWithObjects:
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_CHROME_MISBEHAVES),
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_SOMETHING_MISSING),
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_BROWSER_CRASH),
         l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_OTHER_PROBLEM),
         nil];
 
+    pngHeight_ = 0;
+    pngWidth_ = 0;
+
     if (currentTab_ != NULL) {
       // Get data from current tab, if one exists. This dialog could be called
       // from the main menu with no tab contents, so currentTab_ is not
       // guaranteed to be non-NULL.
       // TODO(mirandac): This dialog should be a tab-modal sheet if a browser
       // window exists.
       [self setSendScreenshot:YES];
       [self setDisableScreenshotCheckbox:NO];
       // Insert menu items about bugs related to specific pages.
       [bugTypeList_ insertObjects:
           [NSArray arrayWithObjects:
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PAGE_WONT_LOAD),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PAGE_LOOKS_ODD),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_PHISHING_PAGE),
               l10n_util::GetNSStringWithFixup(IDS_BUGREPORT_CANT_SIGN_IN),
               nil]
           atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, 4)]];
 
       [self setPageURL:base::SysUTF8ToNSString(
           currentTab_->controller().GetActiveEntry()->url().spec())];
       [self setPageTitle:base::SysUTF16ToNSString(currentTab_->GetTitle())];
-      base::mac::GrabWindowSnapshot(
-          currentTab_->view()->GetTopLevelNativeWindow(), &pngData_,
-          &pngWidth_, &pngHeight_);
+      gfx::Rect pngRect = browser::GrabWindowSnapshot(
+          currentTab_->view()->GetTopLevelNativeWindow(), &pngData_);
+      pngWidth_ = pngRect.width();
+      pngHeight_ = pngRect.height();
     } else {
       // If no current tab exists, create a menu without the "broken page"
       // options, with page URL and title empty, and screenshot disabled.
       [self setSendScreenshot:NO];
       [self setDisableScreenshotCheckbox:YES];
     }
-
-    pngHeight_ = 0;
-    pngWidth_ = 0;
   }
   return self;
 }
 
 - (void)dealloc {
   [pageURL_ release];
   [pageTitle_ release];
   [bugDescription_ release];
   [bugTypeList_ release];
   [bugTypeDictionary_ release];
@@ skipping 134 matching lines @@
 + (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key {
   NSSet* paths = [super keyPathsForValuesAffectingValueForKey:key];
   if ([key isEqualToString:@"isPhishingReport"]) {
     paths = [paths setByAddingObject:@"bugTypeIndex"];
   }
   return paths;
 }
 
 @end