projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
ash
/
system
/
tray
/
fixed_sized_scroll_view.h
diff --git
a/src/ash/system/tray/fixed_sized_scroll_view.h
b/src/ash/system/tray/fixed_sized_scroll_view.h
index
aff53c2
..
d091028
100644
(file)
--- a/
src/ash/system/tray/fixed_sized_scroll_view.h
+++ b/
src/ash/system/tray/fixed_sized_scroll_view.h
@@
-10,7
+10,6
@@
#include "ui/views/controls/scroll_view.h"
namespace ash {
#include "ui/views/controls/scroll_view.h"
namespace ash {
-namespace internal {
// A custom scroll-view that has a specified dimension.
class FixedSizedScrollView : public views::ScrollView {
// A custom scroll-view that has a specified dimension.
class FixedSizedScrollView : public views::ScrollView {
@@
-40,7
+39,6
@@
class FixedSizedScrollView : public views::ScrollView {
DISALLOW_COPY_AND_ASSIGN(FixedSizedScrollView);
};
DISALLOW_COPY_AND_ASSIGN(FixedSizedScrollView);
};
-} // namespace internal
} // namespace ash
#endif // ASH_SYSTEM_TRAY_FIXED_SIZED_SCROLL_VIEW_H_
} // namespace ash
#endif // ASH_SYSTEM_TRAY_FIXED_SIZED_SCROLL_VIEW_H_