chrome/test/base/ui_test_utils_win.cc - Issue 10830135: Revert 149604 - Support calling GrabWindowSnapshot when no BrowserProcess instance is avaliable (eg…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/base/ui_test_utils_win.cc

Issue 10830135: Revert 149604 - Support calling GrabWindowSnapshot when no BrowserProcess instance is avaliable (eg… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/test/base/ui_test_utils_win.cc

===================================================================

--- chrome/test/base/ui_test_utils_win.cc (revision 149605)

+++ chrome/test/base/ui_test_utils_win.cc (working copy)

@@ -14,13 +14,12 @@

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/views/frame/browser_view.h"

+#include "chrome/browser/ui/window_snapshot/window_snapshot.h"

#include "chrome/common/chrome_paths.h"

#include "ui/base/win/foreground_helper.h"

#include "ui/ui_controls/ui_controls.h"

#include "ui/views/focus/focus_manager.h"

-#include "ui/window_snapshot/window_snapshot.h"

namespace ui_test_utils {

namespace {

@@ -125,9 +124,9 @@

RECT& rect = monitor_info.rcMonitor;

std::vector<unsigned char> png_data;

- if (ui::GrabWindowSnapshot(NULL, &png_data,

- gfx::Rect(rect.right - rect.left,

- rect.bottom - rect.top)) &&

+ if (chrome::GrabWindowSnapshot(NULL, &png_data,

+ gfx::Rect(rect.right - rect.left,

+ rect.bottom - rect.top)) &&

png_data.size() <= INT_MAX) {

int bytes = static_cast<int>(png_data.size());

int written = file_util::WriteFile(

« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »