summaryrefslogtreecommitdiffstats
path: root/ui/views/window
diff options
context:
space:
mode:
Diffstat (limited to 'ui/views/window')
-rw-r--r--ui/views/window/client_view.cc4
-rw-r--r--ui/views/window/custom_frame_view.cc8
-rw-r--r--ui/views/window/custom_frame_view.h2
-rw-r--r--ui/views/window/dialog_client_view.cc4
-rw-r--r--ui/views/window/dialog_client_view.h4
-rw-r--r--ui/views/window/dialog_delegate.cc2
-rw-r--r--ui/views/window/dialog_delegate.h2
-rw-r--r--ui/views/window/native_frame_view.cc2
-rw-r--r--ui/views/window/native_frame_view.h2
-rw-r--r--ui/views/window/non_client_view.cc8
-rw-r--r--ui/views/window/non_client_view.h2
-rw-r--r--ui/views/window/window_shape.cc2
12 files changed, 21 insertions, 21 deletions
diff --git a/ui/views/window/client_view.cc b/ui/views/window/client_view.cc
index 560983b..0beaa89 100644
--- a/ui/views/window/client_view.cc
+++ b/ui/views/window/client_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/client_view.h"
+#include "ui/views/window/client_view.h"
#include "base/logging.h"
#include "ui/base/accessibility/accessible_view_state.h"
@@ -14,7 +14,7 @@ namespace views {
// static
const char ClientView::kViewClassName[] =
- "views/window/ClientView";
+ "ui/views/window/ClientView";
///////////////////////////////////////////////////////////////////////////////
// ClientView, public:
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index 989f3c55..78109ef 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/custom_frame_view.h"
+#include "ui/views/window/custom_frame_view.h"
#include <algorithm>
@@ -15,10 +15,10 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/font.h"
#include "ui/gfx/path.h"
+#include "ui/views/window/client_view.h"
+#include "ui/views/window/window_resources.h"
+#include "ui/views/window/window_shape.h"
#include "views/widget/widget_delegate.h"
-#include "views/window/client_view.h"
-#include "views/window/window_resources.h"
-#include "views/window/window_shape.h"
#if defined(USE_AURA)
#include "views/widget/native_widget_aura.h"
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index 8a04dd4..d53eb21 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_view.h
@@ -6,9 +6,9 @@
#define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
#pragma once
+#include "ui/views/window/non_client_view.h"
#include "views/controls/button/image_button.h"
#include "views/widget/widget.h"
-#include "views/window/non_client_view.h"
namespace gfx {
class Canvas;
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 6cf9caa..46c9d03 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/dialog_client_view.h"
+#include "ui/views/window/dialog_client_view.h"
#include "build/build_config.h"
@@ -24,11 +24,11 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/font.h"
+#include "ui/views/window/dialog_delegate.h"
#include "views/controls/button/text_button.h"
#include "views/layout/layout_constants.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
-#include "views/window/dialog_delegate.h"
#if defined(OS_WIN)
#include "ui/gfx/native_theme.h"
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 719eee4..7ea9720 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -7,9 +7,9 @@
#pragma once
#include "ui/gfx/font.h"
-#include "views/focus/focus_manager.h"
+#include "ui/views/window/client_view.h"
#include "views/controls/button/button.h"
-#include "views/window/client_view.h"
+#include "views/focus/focus_manager.h"
namespace views {
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index fc24f90..8da29bb 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/dialog_delegate.h"
+#include "ui/views/window/dialog_delegate.h"
#include "base/logging.h"
#include "views/controls/button/text_button.h"
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index 75b9d5f..530bbd9 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -9,8 +9,8 @@
#include "base/string16.h"
#include "ui/base/accessibility/accessibility_types.h"
#include "ui/base/ui_base_types.h"
+#include "ui/views/window/dialog_client_view.h"
#include "views/widget/widget_delegate.h"
-#include "views/window/dialog_client_view.h"
namespace views {
diff --git a/ui/views/window/native_frame_view.cc b/ui/views/window/native_frame_view.cc
index 8cb7dfd..1a794ee 100644
--- a/ui/views/window/native_frame_view.cc
+++ b/ui/views/window/native_frame_view.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/native_frame_view.h"
+#include "ui/views/window/native_frame_view.h"
#include "views/widget/native_widget.h"
#include "views/widget/widget.h"
diff --git a/ui/views/window/native_frame_view.h b/ui/views/window/native_frame_view.h
index de7f8ae..edcf993 100644
--- a/ui/views/window/native_frame_view.h
+++ b/ui/views/window/native_frame_view.h
@@ -6,7 +6,7 @@
#define UI_VIEWS_WINDOW_NATIVE_FRAME_VIEW_H_
#pragma once
-#include "views/window/non_client_view.h"
+#include "ui/views/window/non_client_view.h"
namespace views {
diff --git a/ui/views/window/non_client_view.cc b/ui/views/window/non_client_view.cc
index be1cdac..9e2be91 100644
--- a/ui/views/window/non_client_view.cc
+++ b/ui/views/window/non_client_view.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/non_client_view.h"
+#include "ui/views/window/non_client_view.h"
#include "ui/base/accessibility/accessible_view_state.h"
#include "ui/base/hit_test.h"
+#include "ui/views/window/client_view.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
-#include "views/window/client_view.h"
namespace views {
@@ -16,10 +16,10 @@ namespace views {
const int NonClientFrameView::kFrameShadowThickness = 1;
const int NonClientFrameView::kClientEdgeThickness = 1;
const char NonClientFrameView::kViewClassName[] =
- "views/window/NonClientFrameView";
+ "ui/views/window/NonClientFrameView";
const char NonClientView::kViewClassName[] =
- "views/window/NonClientView";
+ "ui/views/window/NonClientView";
// The frame view and the client view are always at these specific indices,
// because the RootView message dispatch sends messages to items higher in the
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index db2ab9b..9685d95 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -6,8 +6,8 @@
#define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
#pragma once
+#include "ui/views/window/client_view.h"
#include "views/view.h"
-#include "views/window/client_view.h"
namespace gfx {
class Path;
diff --git a/ui/views/window/window_shape.cc b/ui/views/window/window_shape.cc
index 869ec21..1f6bc13 100644
--- a/ui/views/window/window_shape.cc
+++ b/ui/views/window/window_shape.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "views/window/window_shape.h"
+#include "ui/views/window/window_shape.h"
#include "ui/gfx/path.h"
#include "ui/gfx/size.h"