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

Side by Side Diff: ash/mus/shelf_delegate_mus.cc

Issue 1816753002: Enable mash shelf tooltips. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address destructor comment. Created 4 years, 9 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 | « ash/ash.gyp ('k') | ash/mus/sysui_application.cc » ('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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/shelf_delegate_mus.h" 5 #include "ash/mus/shelf_delegate_mus.h"
6 6
7 #include "ash/shelf/shelf.h" 7 #include "ash/shelf/shelf.h"
8 #include "ash/shelf/shelf_item_delegate.h" 8 #include "ash/shelf/shelf_item_delegate.h"
9 #include "ash/shelf/shelf_item_delegate_manager.h" 9 #include "ash/shelf/shelf_item_delegate_manager.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ShelfMenuModel* CreateApplicationMenu(int event_flags) override { 59 ShelfMenuModel* CreateApplicationMenu(int event_flags) override {
60 NOTIMPLEMENTED(); 60 NOTIMPLEMENTED();
61 return nullptr; 61 return nullptr;
62 } 62 }
63 63
64 bool IsDraggable() override { 64 bool IsDraggable() override {
65 NOTIMPLEMENTED(); 65 NOTIMPLEMENTED();
66 return false; 66 return false;
67 } 67 }
68 68
69 bool ShouldShowTooltip() override { 69 bool ShouldShowTooltip() override { return true; }
70 // NOTIMPLEMENTED(); very noisy
71 return false;
72 }
73 70
74 void Close() override { NOTIMPLEMENTED(); } 71 void Close() override { NOTIMPLEMENTED(); }
75 72
76 // TODO(msw): Support multiple open windows per button. 73 // TODO(msw): Support multiple open windows per button.
77 uint32_t window_id_; 74 uint32_t window_id_;
78 base::string16 title_; 75 base::string16 title_;
79 UserWindowController* user_window_controller_; 76 UserWindowController* user_window_controller_;
80 77
81 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus); 78 DISALLOW_COPY_AND_ASSIGN(ShelfItemDelegateMus);
82 }; 79 };
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 DCHECK_GE(index, 0); 203 DCHECK_GE(index, 0);
207 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id); 204 ShelfItems::const_iterator iter = model_->ItemByID(shelf_id);
208 DCHECK(iter != model_->items().end()); 205 DCHECK(iter != model_->items().end());
209 ShelfItem item = *iter; 206 ShelfItem item = *iter;
210 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING; 207 item.status = has_focus ? STATUS_ACTIVE : STATUS_RUNNING;
211 model_->Set(index, item); 208 model_->Set(index, item);
212 } 209 }
213 210
214 } // namespace sysui 211 } // namespace sysui
215 } // namespace ash 212 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | ash/mus/sysui_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698