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

Side by Side Diff: chrome/browser/views/location_bar_view.cc

Issue 329009: CompactNavigationBar for toolkit views build, with some design change per Cole's request. (Closed)
Patch Set: updates per review Created 11 years, 1 month 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 | « chrome/browser/views/location_bar_view.h ('k') | chrome/test/test_browser_window.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/views/location_bar_view.h" 5 #include "chrome/browser/views/location_bar_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 } else { 432 } else {
433 fetcher.release(); // The navigation controller will delete the fetcher. 433 fetcher.release(); // The navigation controller will delete the fetcher.
434 } 434 }
435 } 435 }
436 } 436 }
437 437
438 void LocationBarView::OnChanged() { 438 void LocationBarView::OnChanged() {
439 DoLayout(false); 439 DoLayout(false);
440 } 440 }
441 441
442 void LocationBarView::OnKillFocus() {
443 }
444
442 void LocationBarView::OnSetFocus() { 445 void LocationBarView::OnSetFocus() {
443 views::FocusManager* focus_manager = GetFocusManager(); 446 views::FocusManager* focus_manager = GetFocusManager();
444 if (!focus_manager) { 447 if (!focus_manager) {
445 NOTREACHED(); 448 NOTREACHED();
446 return; 449 return;
447 } 450 }
448 focus_manager->SetFocusedView(this); 451 focus_manager->SetFocusedView(this);
449 } 452 }
450 453
451 SkBitmap LocationBarView::GetFavIcon() const { 454 SkBitmap LocationBarView::GetFavIcon() const {
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 } 1393 }
1391 1394
1392 int LocationBarView::PageActionVisibleCount() { 1395 int LocationBarView::PageActionVisibleCount() {
1393 int result = 0; 1396 int result = 0;
1394 for (size_t i = 0; i < page_action_views_.size(); i++) { 1397 for (size_t i = 0; i < page_action_views_.size(); i++) {
1395 if (page_action_views_[i]->IsVisible()) 1398 if (page_action_views_[i]->IsVisible())
1396 ++result; 1399 ++result;
1397 } 1400 }
1398 return result; 1401 return result;
1399 } 1402 }
OLDNEW
« no previous file with comments | « chrome/browser/views/location_bar_view.h ('k') | chrome/test/test_browser_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698