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

Unified Diff: ui/views/controls/scrollbar/native_scroll_bar_views.h

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « ui/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/scrollbar/native_scroll_bar_views.h
===================================================================
--- ui/views/controls/scrollbar/native_scroll_bar_views.h (revision 137002)
+++ ui/views/controls/scrollbar/native_scroll_bar_views.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#pragma once
#include "base/compiler_specific.h"
-#include "ui/base/native_theme/native_theme.h"
+#include "ui/gfx/native_theme.h"
#include "ui/gfx/point.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/scrollbar/base_scroll_bar.h"
@@ -69,9 +69,9 @@
Button* prev_button_;
Button* next_button_;
- ui::NativeTheme::ExtraParams params_;
- ui::NativeTheme::Part part_;
- ui::NativeTheme::State state_;
+ gfx::NativeTheme::ExtraParams params_;
+ gfx::NativeTheme::Part part_;
+ gfx::NativeTheme::State state_;
DISALLOW_COPY_AND_ASSIGN(NativeScrollBarViews);
};
« no previous file with comments | « ui/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/scrollbar/native_scroll_bar_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698