| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/browser/app_window/app_window.h" | 5 #include "extensions/browser/app_window/app_window.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "extensions/common/manifest_handlers/icons_handler.h" | 50 #include "extensions/common/manifest_handlers/icons_handler.h" |
| 51 #include "extensions/common/permissions/permissions_data.h" | 51 #include "extensions/common/permissions/permissions_data.h" |
| 52 #include "extensions/common/switches.h" | 52 #include "extensions/common/switches.h" |
| 53 #include "extensions/grit/extensions_browser_resources.h" | 53 #include "extensions/grit/extensions_browser_resources.h" |
| 54 #include "third_party/skia/include/core/SkRegion.h" | 54 #include "third_party/skia/include/core/SkRegion.h" |
| 55 #include "ui/base/resource/resource_bundle.h" | 55 #include "ui/base/resource/resource_bundle.h" |
| 56 #include "ui/events/keycodes/keyboard_codes.h" | 56 #include "ui/events/keycodes/keyboard_codes.h" |
| 57 #include "ui/gfx/screen.h" | 57 #include "ui/gfx/screen.h" |
| 58 | 58 |
| 59 #if !defined(OS_MACOSX) | 59 #if !defined(OS_MACOSX) |
| 60 #include "base/prefs/pref_service.h" | 60 #include "components/prefs/pref_service.h" |
| 61 #include "extensions/browser/pref_names.h" | 61 #include "extensions/browser/pref_names.h" |
| 62 #endif | 62 #endif |
| 63 | 63 |
| 64 using content::BrowserContext; | 64 using content::BrowserContext; |
| 65 using content::ConsoleMessageLevel; | 65 using content::ConsoleMessageLevel; |
| 66 using content::WebContents; | 66 using content::WebContents; |
| 67 using web_modal::WebContentsModalDialogHost; | 67 using web_modal::WebContentsModalDialogHost; |
| 68 using web_modal::WebContentsModalDialogManager; | 68 using web_modal::WebContentsModalDialogManager; |
| 69 | 69 |
| 70 namespace extensions { | 70 namespace extensions { |
| (...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1112 region.bounds.x(), | 1112 region.bounds.x(), |
| 1113 region.bounds.y(), | 1113 region.bounds.y(), |
| 1114 region.bounds.right(), | 1114 region.bounds.right(), |
| 1115 region.bounds.bottom(), | 1115 region.bounds.bottom(), |
| 1116 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); | 1116 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); |
| 1117 } | 1117 } |
| 1118 return sk_region; | 1118 return sk_region; |
| 1119 } | 1119 } |
| 1120 | 1120 |
| 1121 } // namespace extensions | 1121 } // namespace extensions |
| OLD | NEW |