summaryrefslogtreecommitdiffstats
path: root/ash/test/display_manager_test_api.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 20:59:28 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-03 20:59:28 +0000
commit093b8d64a16506cf8f2bd77d8b0cc7446065add3 (patch)
treecc28b83de1bb4c9bfba0fc48c004405c97b95441 /ash/test/display_manager_test_api.h
parente95d6cdbc67f44abb6e4254b869d1f704305d559 (diff)
downloadchromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.zip
chromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.tar.gz
chromium_src-093b8d64a16506cf8f2bd77d8b0cc7446065add3.tar.bz2
Eliminate ash::internal namespace
Plus obvious style nit fixes. BUG=None TBR=sky@chromium.org Review URL: https://codereview.chromium.org/224113005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/display_manager_test_api.h')
-rw-r--r--ash/test/display_manager_test_api.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/test/display_manager_test_api.h b/ash/test/display_manager_test_api.h
index db47ab3..6c5d565 100644
--- a/ash/test/display_manager_test_api.h
+++ b/ash/test/display_manager_test_api.h
@@ -12,15 +12,13 @@
#include "ui/display/display_constants.h"
namespace ash {
-namespace internal {
class DisplayManager;
-} // internal
namespace test {
class DisplayManagerTestApi {
public:
- explicit DisplayManagerTestApi(internal::DisplayManager* display_manager);
+ explicit DisplayManagerTestApi(DisplayManager* display_manager);
virtual ~DisplayManagerTestApi();
// Update the display configuration as given in |display_specs|. The format of
@@ -42,7 +40,7 @@ class DisplayManagerTestApi {
const std::vector<ui::ColorCalibrationProfile>& profiles);
private:
- internal::DisplayManager* display_manager_; // not owned
+ DisplayManager* display_manager_; // not owned
DISALLOW_COPY_AND_ASSIGN(DisplayManagerTestApi);
};