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

Side by Side Diff: third_party/WebKit/Source/web/ColorChooserPopupUIController.h

Issue 2919593004: Remove dependency of ColorChooserPopupUIController on ChromeClientImpl (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 13 matching lines...) Expand all
24 */ 24 */
25 25
26 #ifndef ColorChooserPopupUIController_h 26 #ifndef ColorChooserPopupUIController_h
27 #define ColorChooserPopupUIController_h 27 #define ColorChooserPopupUIController_h
28 28
29 #include "core/page/PagePopupClient.h" 29 #include "core/page/PagePopupClient.h"
30 #include "web/ColorChooserUIController.h" 30 #include "web/ColorChooserUIController.h"
31 31
32 namespace blink { 32 namespace blink {
33 33
34 class ChromeClientImpl; 34 class ChromeClient;
35 class ColorChooserClient; 35 class ColorChooserClient;
36 class PagePopup; 36 class PagePopup;
37 37
38 class ColorChooserPopupUIController final : public ColorChooserUIController, 38 class ColorChooserPopupUIController final : public ColorChooserUIController,
39 public PagePopupClient { 39 public PagePopupClient {
40 USING_PRE_FINALIZER(ColorChooserPopupUIController, Dispose); 40 USING_PRE_FINALIZER(ColorChooserPopupUIController, Dispose);
41 41
42 public: 42 public:
43 static ColorChooserPopupUIController* Create(LocalFrame* frame, 43 static ColorChooserPopupUIController* Create(LocalFrame* frame,
44 ChromeClientImpl* chrome_client, 44 ChromeClient* chrome_client,
45 ColorChooserClient* client) { 45 ColorChooserClient* client) {
46 return new ColorChooserPopupUIController(frame, chrome_client, client); 46 return new ColorChooserPopupUIController(frame, chrome_client, client);
47 } 47 }
48 48
49 ~ColorChooserPopupUIController() override; 49 ~ColorChooserPopupUIController() override;
50 DECLARE_VIRTUAL_TRACE(); 50 DECLARE_VIRTUAL_TRACE();
51 51
52 // ColorChooserUIController functions: 52 // ColorChooserUIController functions:
53 void OpenUI() override; 53 void OpenUI() override;
54 54
55 // ColorChooser functions 55 // ColorChooser functions
56 void EndChooser() override; 56 void EndChooser() override;
57 AXObject* RootAXObject() override; 57 AXObject* RootAXObject() override;
58 58
59 // PagePopupClient functions: 59 // PagePopupClient functions:
60 void WriteDocument(SharedBuffer*) override; 60 void WriteDocument(SharedBuffer*) override;
61 void SelectFontsFromOwnerDocument(Document&) override {} 61 void SelectFontsFromOwnerDocument(Document&) override {}
62 Locale& GetLocale() override; 62 Locale& GetLocale() override;
63 void SetValueAndClosePopup(int, const String&) override; 63 void SetValueAndClosePopup(int, const String&) override;
64 void SetValue(const String&) override; 64 void SetValue(const String&) override;
65 void ClosePopup() override; 65 void ClosePopup() override;
66 Element& OwnerElement() override; 66 Element& OwnerElement() override;
67 void DidClosePopup() override; 67 void DidClosePopup() override;
68 68
69 private: 69 private:
70 ColorChooserPopupUIController(LocalFrame*, 70 ColorChooserPopupUIController(LocalFrame*,
71 ChromeClientImpl*, 71 ChromeClient*,
72 ColorChooserClient*); 72 ColorChooserClient*);
73 73
74 void OpenPopup(); 74 void OpenPopup();
75 void Dispose(); 75 void Dispose();
76 76
77 Member<ChromeClientImpl> chrome_client_; 77 Member<ChromeClient> chrome_client_;
78 PagePopup* popup_; 78 PagePopup* popup_;
79 Locale& locale_; 79 Locale& locale_;
80 }; 80 };
81 81
82 } // namespace blink 82 } // namespace blink
83 83
84 #endif // ColorChooserPopupUIController_h 84 #endif // ColorChooserPopupUIController_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/web/ColorChooserPopupUIController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698