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

Unified Diff: apps/ui/views/app_window_frame_view.cc

Issue 616253002: Extract NativeAppWindow from src/extensions Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: might fix athena. similarity=33 Created 6 years, 3 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 | « apps/ui/views/app_window_frame_view.h ('k') | athena/athena.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/ui/views/app_window_frame_view.cc
diff --git a/apps/ui/views/app_window_frame_view.cc b/apps/ui/views/app_window_frame_view.cc
index 60645d0fdd2dd5fa413f877d1e9ebf1f3e948281..6e3fd557aa3b0f2dc71fddec32cde030918c50bd 100644
--- a/apps/ui/views/app_window_frame_view.cc
+++ b/apps/ui/views/app_window_frame_view.cc
@@ -5,8 +5,8 @@
#include "apps/ui/views/app_window_frame_view.h"
#include "base/strings/utf_string_conversions.h"
-#include "extensions/browser/app_window/native_app_window.h"
-#include "extensions/common/draggable_region.h"
+#include "components/native_app_window/draggable_region.h"
+#include "components/native_app_window/native_app_window.h"
#include "grit/theme_resources.h"
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkRegion.h"
@@ -37,11 +37,12 @@ namespace apps {
const char AppWindowFrameView::kViewClassName[] =
"browser/ui/views/extensions/AppWindowFrameView";
-AppWindowFrameView::AppWindowFrameView(views::Widget* widget,
- extensions::NativeAppWindow* window,
- bool draw_frame,
- const SkColor& active_frame_color,
- const SkColor& inactive_frame_color)
+AppWindowFrameView::AppWindowFrameView(
+ views::Widget* widget,
+ native_app_window::NativeAppWindow* window,
+ bool draw_frame,
+ const SkColor& active_frame_color,
+ const SkColor& inactive_frame_color)
: widget_(widget),
window_(window),
draw_frame_(draw_frame),
« no previous file with comments | « apps/ui/views/app_window_frame_view.h ('k') | athena/athena.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698