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

Side by Side Diff: chrome/browser/ui/extensions/shell_window.cc

Issue 12213093: Remove ImageLoadingTracker class (Closed) Base URL: https://git.chromium.org/chromium/src.git@Issue_163929
Patch Set: Fix merge conflict Created 7 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/extensions/shell_window.h" 5 #include "chrome/browser/ui/extensions/shell_window.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/extensions/extension_process_manager.h" 9 #include "chrome/browser/extensions/extension_process_manager.h"
10 #include "chrome/browser/extensions/extension_system.h" 10 #include "chrome/browser/extensions/extension_system.h"
(...skipping 30 matching lines...) Expand all
41 #include "content/public/browser/notification_types.h" 41 #include "content/public/browser/notification_types.h"
42 #include "content/public/browser/render_process_host.h" 42 #include "content/public/browser/render_process_host.h"
43 #include "content/public/browser/render_view_host.h" 43 #include "content/public/browser/render_view_host.h"
44 #include "content/public/browser/resource_dispatcher_host.h" 44 #include "content/public/browser/resource_dispatcher_host.h"
45 #include "content/public/browser/site_instance.h" 45 #include "content/public/browser/site_instance.h"
46 #include "content/public/browser/web_contents.h" 46 #include "content/public/browser/web_contents.h"
47 #include "content/public/common/media_stream_request.h" 47 #include "content/public/common/media_stream_request.h"
48 #include "content/public/common/renderer_preferences.h" 48 #include "content/public/common/renderer_preferences.h"
49 #include "skia/ext/image_operations.h" 49 #include "skia/ext/image_operations.h"
50 #include "third_party/skia/include/core/SkRegion.h" 50 #include "third_party/skia/include/core/SkRegion.h"
51 #include "ui/gfx/image/image_skia.h"
51 52
52 #if defined(USE_ASH) 53 #if defined(USE_ASH)
53 #include "ash/launcher/launcher_types.h" 54 #include "ash/launcher/launcher_types.h"
54 #endif 55 #endif
55 56
56 namespace app_window = extensions::api::app_window; 57 namespace app_window = extensions::api::app_window;
57 58
58 using content::BrowserThread; 59 using content::BrowserThread;
59 using content::ConsoleMessageLevel; 60 using content::ConsoleMessageLevel;
60 using content::RenderViewHost; 61 using content::RenderViewHost;
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 const extensions::DraggableRegion& region = *iter; 624 const extensions::DraggableRegion& region = *iter;
624 sk_region->op( 625 sk_region->op(
625 region.bounds.x(), 626 region.bounds.x(),
626 region.bounds.y(), 627 region.bounds.y(),
627 region.bounds.right(), 628 region.bounds.right(),
628 region.bounds.bottom(), 629 region.bounds.bottom(),
629 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op); 630 region.draggable ? SkRegion::kUnion_Op : SkRegion::kDifference_Op);
630 } 631 }
631 return sk_region; 632 return sk_region;
632 } 633 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698