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

Unified Diff: ui/wm/core/shadow.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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/wm/core/shadow.h ('k') | ui/wm/core/shadow_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/shadow.cc
diff --git a/ui/wm/core/shadow.cc b/ui/wm/core/shadow.cc
index fb2d9400a8756f67a011011ffb39695c05193b8c..1eb0ac6b4e3523c4890354f1efa88f77fc89bc21 100644
--- a/ui/wm/core/shadow.cc
+++ b/ui/wm/core/shadow.cc
@@ -24,25 +24,25 @@ const int kSmallInteriorInset = 5;
// Duration for opacity animation in milliseconds.
const int kShadowAnimationDurationMs = 100;
-float GetOpacityForStyle(views::corewm::Shadow::Style style) {
+float GetOpacityForStyle(wm::Shadow::Style style) {
switch (style) {
- case views::corewm::Shadow::STYLE_ACTIVE:
+ case wm::Shadow::STYLE_ACTIVE:
return kActiveShadowOpacity;
- case views::corewm::Shadow::STYLE_INACTIVE:
+ case wm::Shadow::STYLE_INACTIVE:
return kInactiveShadowOpacity;
- case views::corewm::Shadow::STYLE_SMALL:
+ case wm::Shadow::STYLE_SMALL:
return kSmallShadowOpacity;
}
return 1.0f;
}
-int GetInteriorInsetForStyle(views::corewm::Shadow::Style style) {
+int GetInteriorInsetForStyle(wm::Shadow::Style style) {
switch (style) {
- case views::corewm::Shadow::STYLE_ACTIVE:
+ case wm::Shadow::STYLE_ACTIVE:
return kActiveInteriorInset;
- case views::corewm::Shadow::STYLE_INACTIVE:
+ case wm::Shadow::STYLE_INACTIVE:
return kInactiveInteriorInset;
- case views::corewm::Shadow::STYLE_SMALL:
+ case wm::Shadow::STYLE_SMALL:
return kSmallInteriorInset;
}
return 0;
@@ -50,8 +50,7 @@ int GetInteriorInsetForStyle(views::corewm::Shadow::Style style) {
} // namespace
-namespace views {
-namespace corewm {
+namespace wm {
Shadow::Shadow() : style_(STYLE_ACTIVE), interior_inset_(0) {
}
@@ -191,5 +190,4 @@ void Shadow::UpdateImageGridBounds() {
image_grid_->SetContentBounds(image_grid_bounds);
}
-} // namespace corewm
-} // namespace views
+} // namespace wm
« no previous file with comments | « ui/wm/core/shadow.h ('k') | ui/wm/core/shadow_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698