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

Side by Side Diff: athena/activity/activity_view_manager_impl.cc

Issue 550643002: [Athena] Hack to display favicons for web activities in overview mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « athena/activity/activity_frame_view.cc ('k') | athena/activity/public/activity_view_model.h » ('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 "athena/activity/public/activity_view_manager.h" 5 #include "athena/activity/public/activity_view_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "athena/activity/activity_widget_delegate.h" 10 #include "athena/activity/activity_widget_delegate.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 CHECK_EQ(this, instance); 48 CHECK_EQ(this, instance);
49 instance = NULL; 49 instance = NULL;
50 } 50 }
51 51
52 // ActivityViewManager: 52 // ActivityViewManager:
53 virtual void AddActivity(Activity* activity) OVERRIDE { 53 virtual void AddActivity(Activity* activity) OVERRIDE {
54 CHECK(activity_widgets_.end() == activity_widgets_.find(activity)); 54 CHECK(activity_widgets_.end() == activity_widgets_.find(activity));
55 views::Widget* container = CreateWidget(activity); 55 views::Widget* container = CreateWidget(activity);
56 container->AddObserver(this); 56 container->AddObserver(this);
57 activity_widgets_[activity] = container; 57 activity_widgets_[activity] = container;
58 container->UpdateWindowTitle();
59 container->Show(); 58 container->Show();
60 container->Activate(); 59 container->Activate();
61 // Call the Activity model's initializer. It might re-order the activity 60 // Call the Activity model's initializer. It might re-order the activity
62 // against others, which has to be done before before registering it to the 61 // against others, which has to be done before before registering it to the
63 // system. 62 // system.
64 activity->GetActivityViewModel()->Init(); 63 activity->GetActivityViewModel()->Init();
65 } 64 }
66 65
67 virtual void RemoveActivity(Activity* activity) OVERRIDE { 66 virtual void RemoveActivity(Activity* activity) OVERRIDE {
68 ActivityWidgetMap::iterator find = activity_widgets_.find(activity); 67 ActivityWidgetMap::iterator find = activity_widgets_.find(activity);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 ActivityViewManager* ActivityViewManager::Get() { 111 ActivityViewManager* ActivityViewManager::Get() {
113 return instance; 112 return instance;
114 } 113 }
115 114
116 void ActivityViewManager::Shutdown() { 115 void ActivityViewManager::Shutdown() {
117 CHECK(instance); 116 CHECK(instance);
118 delete instance; 117 delete instance;
119 } 118 }
120 119
121 } // namespace athena 120 } // namespace athena
OLDNEW
« no previous file with comments | « athena/activity/activity_frame_view.cc ('k') | athena/activity/public/activity_view_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698