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

Unified Diff: chrome/browser/chromeos/notifications/notification_browsertest.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/chromeos/native_dialog_window.cc ('k') | chrome/browser/chromeos/wm_ipc.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/notifications/notification_browsertest.cc
===================================================================
--- chrome/browser/chromeos/notifications/notification_browsertest.cc (revision 71854)
+++ chrome/browser/chromeos/notifications/notification_browsertest.cc (working copy)
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "app/x11_util.h"
#include "base/message_loop.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
@@ -21,6 +20,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
+#include "ui/base/x/x11_util.h"
namespace {
@@ -49,7 +49,7 @@
// Detect if we're running under ChromeOS WindowManager. See
// the description for "under_chromeos_" below for why we need this.
std::string wm_name;
- bool wm_name_valid = x11_util::GetWindowManagerName(&wm_name);
+ bool wm_name_valid = ui::GetWindowManagerName(&wm_name);
// NOTE: On Chrome OS the wm and Chrome are started in parallel. This
// means it's possible for us not to be able to get the name of the window
// manager. We assume that when this happens we're on Chrome OS.
« no previous file with comments | « chrome/browser/chromeos/native_dialog_window.cc ('k') | chrome/browser/chromeos/wm_ipc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698