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

Unified Diff: components/webui_generator/view.h

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/view_manager/animation_runner.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/webui_generator/view.h
diff --git a/components/webui_generator/view.h b/components/webui_generator/view.h
index b43ad743f067275f010bf5c459796a28291bb837..934fa3da7807aac66ae743c228d2828d6f7d32ce 100644
--- a/components/webui_generator/view.h
+++ b/components/webui_generator/view.h
@@ -71,7 +71,9 @@ class WUG_EXPORT View {
bool ready() const { return ready_; }
- base::ScopedPtrHashMap<std::string, View>& children() { return children_; }
+ base::ScopedPtrHashMap<std::string, scoped_ptr<View>>& children() {
+ return children_;
+ }
// Adds |child| to the list of children of |this|. Can be called only from
// CreateAndAddChildren() override.
@@ -104,7 +106,7 @@ class WUG_EXPORT View {
bool view_model_ready_;
bool ready_;
- base::ScopedPtrHashMap<std::string, View> children_;
+ base::ScopedPtrHashMap<std::string, scoped_ptr<View>> children_;
scoped_ptr<ViewModel> view_model_;
base::WeakPtrFactory<View> weak_factory_;
« no previous file with comments | « components/view_manager/animation_runner.h ('k') | content/browser/media/cdm/browser_cdm_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698