Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4687)

Unified Diff: chrome/browser/ui/window_snapshot/window_snapshot_aura.cc

Issue 9630002: Ash: Remove compact window mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: OpaqueBrowserFrameView, MultipleWindowIndicatorButton Created 8 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/window_snapshot/window_snapshot_aura.cc
diff --git a/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc b/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc
index 7636c8a2f7f25fe3c8191df4cd86f95c3718882b..9e74a223c4c67405e80cd3804728098b9bd0c03d 100644
--- a/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc
+++ b/chrome/browser/ui/window_snapshot/window_snapshot_aura.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/window_snapshot/window_snapshot.h"
-#include "ash/shell.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/aura/window.h"
@@ -23,9 +22,8 @@ bool GrabWindowSnapshot(gfx::NativeWindow window,
// When not in compact mode we must take into account the window's position on
// the desktop.
- if (!ash::Shell::GetInstance()->IsWindowModeCompact())
- read_pixels_bounds.set_origin(
- snapshot_bounds.origin().Add(window->bounds().origin()));
+ read_pixels_bounds.set_origin(
+ snapshot_bounds.origin().Add(window->bounds().origin()));
DCHECK_GE(compositor->size().width(), read_pixels_bounds.right());
DCHECK_GE(compositor->size().height(), read_pixels_bounds.bottom());
« no previous file with comments | « chrome/browser/ui/webui/ntp/new_tab_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698