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

Side by Side Diff: apps/app_window.cc

Issue 194333002: Move extension_messages.h to extensions/common. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge again 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « apps/DEPS ('k') | apps/app_window_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "apps/app_window.h" 5 #include "apps/app_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "apps/app_window_geometry_cache.h" 9 #include "apps/app_window_geometry_cache.h"
10 #include "apps/app_window_registry.h" 10 #include "apps/app_window_registry.h"
11 #include "apps/apps_client.h" 11 #include "apps/apps_client.h"
12 #include "apps/size_constraints.h" 12 #include "apps/size_constraints.h"
13 #include "apps/ui/native_app_window.h" 13 #include "apps/ui/native_app_window.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/extensions/extension_web_contents_observer.h" 19 #include "chrome/browser/extensions/extension_web_contents_observer.h"
20 #include "chrome/browser/extensions/suggest_permission_util.h" 20 #include "chrome/browser/extensions/suggest_permission_util.h"
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/extensions/extension_messages.h"
23 #include "chrome/common/extensions/manifest_handlers/icons_handler.h" 22 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
24 #include "components/web_modal/web_contents_modal_dialog_manager.h" 23 #include "components/web_modal/web_contents_modal_dialog_manager.h"
25 #include "content/public/browser/browser_context.h" 24 #include "content/public/browser/browser_context.h"
26 #include "content/public/browser/invalidate_type.h" 25 #include "content/public/browser/invalidate_type.h"
27 #include "content/public/browser/navigation_entry.h" 26 #include "content/public/browser/navigation_entry.h"
28 #include "content/public/browser/notification_details.h" 27 #include "content/public/browser/notification_details.h"
29 #include "content/public/browser/notification_service.h" 28 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_source.h" 29 #include "content/public/browser/notification_source.h"
31 #include "content/public/browser/notification_types.h" 30 #include "content/public/browser/notification_types.h"
32 #include "content/public/browser/render_view_host.h" 31 #include "content/public/browser/render_view_host.h"
33 #include "content/public/browser/resource_dispatcher_host.h" 32 #include "content/public/browser/resource_dispatcher_host.h"
34 #include "content/public/browser/web_contents.h" 33 #include "content/public/browser/web_contents.h"
35 #include "content/public/browser/web_contents_view.h" 34 #include "content/public/browser/web_contents_view.h"
36 #include "content/public/common/media_stream_request.h" 35 #include "content/public/common/media_stream_request.h"
37 #include "extensions/browser/extension_system.h" 36 #include "extensions/browser/extension_system.h"
38 #include "extensions/browser/extensions_browser_client.h" 37 #include "extensions/browser/extensions_browser_client.h"
39 #include "extensions/browser/process_manager.h" 38 #include "extensions/browser/process_manager.h"
40 #include "extensions/browser/view_type_utils.h" 39 #include "extensions/browser/view_type_utils.h"
41 #include "extensions/common/extension.h" 40 #include "extensions/common/extension.h"
41 #include "extensions/common/extension_messages.h"
42 #include "third_party/skia/include/core/SkRegion.h" 42 #include "third_party/skia/include/core/SkRegion.h"
43 #include "ui/gfx/screen.h" 43 #include "ui/gfx/screen.h"
44 44
45 #if !defined(OS_MACOSX) 45 #if !defined(OS_MACOSX)
46 #include "apps/pref_names.h" 46 #include "apps/pref_names.h"
47 #include "base/prefs/pref_service.h" 47 #include "base/prefs/pref_service.h"
48 #endif 48 #endif
49 49
50 using content::BrowserContext; 50 using content::BrowserContext;
51 using content::ConsoleMessageLevel; 51 using content::ConsoleMessageLevel;
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1074 region.bounds.x(), 1074 region.bounds.x(),
1075 region.bounds.y(), 1075 region.bounds.y(),
1076 region.bounds.right(), 1076 region.bounds.right(),
1077 region.bounds.bottom(), 1077 region.bounds.bottom(),
1078 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); 1078 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
1079 } 1079 }
1080 return sk_region; 1080 return sk_region;
1081 } 1081 }
1082 1082
1083 } // namespace apps 1083 } // namespace apps
OLDNEW
« no previous file with comments | « apps/DEPS ('k') | apps/app_window_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698