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

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 6677051: fav icon -> favicon. Pass 8: content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/common/render_messages.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/metrics/user_metrics.h" 9 #include "chrome/browser/metrics/user_metrics.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 if (app_icon) 391 if (app_icon)
392 data->favicon = *app_icon; 392 data->favicon = *app_icon;
393 else 393 else
394 data->favicon = contents->GetFavicon(); 394 data->favicon = contents->GetFavicon();
395 data->network_state = TabContentsNetworkState(contents); 395 data->network_state = TabContentsNetworkState(contents);
396 data->title = contents->GetTitle(); 396 data->title = contents->GetTitle();
397 data->loading = contents->is_loading(); 397 data->loading = contents->is_loading();
398 data->crashed_status = contents->crashed_status(); 398 data->crashed_status = contents->crashed_status();
399 data->incognito = contents->profile()->IsOffTheRecord(); 399 data->incognito = contents->profile()->IsOffTheRecord();
400 data->show_icon = contents->ShouldDisplayFavIcon(); 400 data->show_icon = contents->ShouldDisplayFavicon();
401 data->mini = model_->IsMiniTab(model_index); 401 data->mini = model_->IsMiniTab(model_index);
402 data->blocked = model_->IsTabBlocked(model_index); 402 data->blocked = model_->IsTabBlocked(model_index);
403 data->app = contents->is_app(); 403 data->app = contents->is_app();
404 } 404 }
405 405
406 void BrowserTabStripController::StartHighlightTabsForCommand( 406 void BrowserTabStripController::StartHighlightTabsForCommand(
407 TabStripModel::ContextMenuCommand command_id, 407 TabStripModel::ContextMenuCommand command_id,
408 BaseTab* tab) { 408 BaseTab* tab) {
409 if (command_id == TabStripModel::CommandCloseOtherTabs || 409 if (command_id == TabStripModel::CommandCloseOtherTabs ||
410 command_id == TabStripModel::CommandCloseTabsToRight) { 410 command_id == TabStripModel::CommandCloseTabsToRight) {
(...skipping 27 matching lines...) Expand all
438 DCHECK(type.value == NotificationType::TAB_CLOSEABLE_STATE_CHANGED); 438 DCHECK(type.value == NotificationType::TAB_CLOSEABLE_STATE_CHANGED);
439 // Note that this notification may be fired during a model mutation and 439 // Note that this notification may be fired during a model mutation and
440 // possibly before the tabstrip has processed the change. 440 // possibly before the tabstrip has processed the change.
441 // Here, we just re-layout each existing tab to reflect the change in its 441 // Here, we just re-layout each existing tab to reflect the change in its
442 // closeable state, and then schedule paint for entire tabstrip. 442 // closeable state, and then schedule paint for entire tabstrip.
443 for (int i = 0; i < tabstrip_->tab_count(); ++i) { 443 for (int i = 0; i < tabstrip_->tab_count(); ++i) {
444 tabstrip_->base_tab_at_tab_index(i)->Layout(); 444 tabstrip_->base_tab_at_tab_index(i)->Layout();
445 } 445 }
446 tabstrip_->SchedulePaint(); 446 tabstrip_->SchedulePaint();
447 } 447 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc ('k') | chrome/common/render_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698