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

Unified Diff: chrome/browser/ui/ash/session_state_delegate_views.cc

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 years, 8 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/browser/ui/ash/session_state_delegate_views.cc
diff --git a/chrome/browser/ui/ash/session_state_delegate_views.cc b/chrome/browser/ui/ash/session_state_delegate_views.cc
index e3e86b17dfcfb80b59885a46b713163f67331097..5955c9d7a2398767de79f5620d7d0aae6a6e2a72 100644
--- a/chrome/browser/ui/ash/session_state_delegate_views.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_views.cc
@@ -9,11 +9,6 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/gfx/image/image_skia.h"
-namespace {
-// This isn't really used. It is mainly here to make the compiler happy.
-gfx::ImageSkia null_image;
-}
-
SessionStateDelegate::SessionStateDelegate() {
}
@@ -99,7 +94,7 @@ const gfx::ImageSkia& SessionStateDelegate::GetUserImage(
content::BrowserContext* context) const {
NOTIMPLEMENTED();
// To make the compiler happy.
- return null_image;
+ return null_image_;
}
bool SessionStateDelegate::ShouldShowAvatar(aura::Window* window) {

Powered by Google App Engine
This is Rietveld 408576698