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

Side by Side Diff: ui/android/resources/ui_resource_android.h

Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from newt@ review Created 5 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 unified diff | Download patch
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 #ifndef UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_ 5 #ifndef UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_
6 #define UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_ 6 #define UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "cc/resources/ui_resource_bitmap.h" 9 #include "cc/resources/ui_resource_bitmap.h"
10 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
11 #include "ui/android/resources/ui_resource_client_android.h" 11 #include "ui/android/resources/ui_resource_client_android.h"
12 #include "ui/android/ui_android_export.h" 12 #include "ui/android/ui_android_export.h"
13 #include "ui/gfx/android/java_bitmap.h" 13 #include "ui/gfx/android/java_bitmap.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 class UIResourceProvider; 17 class UIResourceProvider;
18 18
19 class UI_ANDROID_EXPORT UIResourceAndroid : public ui::UIResourceClientAndroid { 19 class UI_ANDROID_EXPORT UIResourceAndroid : public ui::UIResourceClientAndroid {
20 public: 20 public:
21 static scoped_ptr<UIResourceAndroid> CreateFromJavaBitmap( 21 static scoped_ptr<UIResourceAndroid> CreateFromJavaBitmap(
22 ui::UIResourceProvider* provider, 22 ui::UIResourceProvider* provider,
23 const gfx::JavaBitmap& java_bitmap); 23 const gfx::JavaBitmap& java_bitmap);
24 24
25 ~UIResourceAndroid() override; 25 ~UIResourceAndroid() override;
26 26
27 const SkBitmap& GetSkBitmap();
28
27 // cc::UIResourceClient implementation. 29 // cc::UIResourceClient implementation.
28 cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid, 30 cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
29 bool resource_lost) override; 31 bool resource_lost) override;
30 32
31 // ui::UIResourceClientAndroid implementation. 33 // ui::UIResourceClientAndroid implementation.
32 void UIResourceIsInvalid() override; 34 void UIResourceIsInvalid() override;
33 35
34 cc::UIResourceId id(); 36 cc::UIResourceId id();
35 37
36 private: 38 private:
37 UIResourceAndroid(ui::UIResourceProvider* provider, const SkBitmap& skbitmap); 39 UIResourceAndroid(ui::UIResourceProvider* provider, const SkBitmap& skbitmap);
38 40
39 ui::UIResourceProvider* provider_; 41 ui::UIResourceProvider* provider_;
40 SkBitmap bitmap_; 42 SkBitmap bitmap_;
41 cc::UIResourceId id_; 43 cc::UIResourceId id_;
42 44
43 DISALLOW_COPY_AND_ASSIGN(UIResourceAndroid); 45 DISALLOW_COPY_AND_ASSIGN(UIResourceAndroid);
44 }; 46 };
45 47
46 } // namespace ui 48 } // namespace ui
47 49
48 #endif // UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_ 50 #endif // UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698