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

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

Issue 10796116: [Web Intents] Basic location bar UI for window disposition picker affordance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Refactor content settings to PageTool base class. Add stubs for mac/win. Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 size_t count_before = page_action_views_.size(); 454 size_t count_before = page_action_views_.size();
455 DeletePageActionViews(); 455 DeletePageActionViews();
456 if (page_action_views_.size() != count_before) { 456 if (page_action_views_.size() != count_before) {
457 content::NotificationService::current()->Notify( 457 content::NotificationService::current()->Notify(
458 chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED, 458 chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
459 content::Source<LocationBar>(this), 459 content::Source<LocationBar>(this),
460 content::NotificationService::NoDetails()); 460 content::NotificationService::NoDetails());
461 } 461 }
462 } 462 }
463 463
464 void LocationBarView::UpdateWebIntentsTool() {
465 // TODO(gbillock): implement this for views
466 }
467
464 void LocationBarView::OnFocus() { 468 void LocationBarView::OnFocus() {
465 // Focus the view widget first which implements accessibility for 469 // Focus the view widget first which implements accessibility for
466 // Chrome OS. It is noop on Win. This should be removed once 470 // Chrome OS. It is noop on Win. This should be removed once
467 // Chrome OS migrates to aura, which uses Views' textfield that receives 471 // Chrome OS migrates to aura, which uses Views' textfield that receives
468 // focus. See crbug.com/106428. 472 // focus. See crbug.com/106428.
469 GetWidget()->NotifyAccessibilityEvent( 473 GetWidget()->NotifyAccessibilityEvent(
470 this, ui::AccessibilityTypes::EVENT_FOCUS, false); 474 this, ui::AccessibilityTypes::EVENT_FOCUS, false);
471 475
472 // Then focus the native location view which implements accessibility for 476 // Then focus the native location view which implements accessibility for
473 // Windows. 477 // Windows.
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 } 1529 }
1526 1530
1527 void LocationBarView::CleanupFadeAnimation() { 1531 void LocationBarView::CleanupFadeAnimation() {
1528 // Since we're no longer animating we don't need our layer. 1532 // Since we're no longer animating we don't need our layer.
1529 SetPaintToLayer(false); 1533 SetPaintToLayer(false);
1530 // Bubble labels don't need a transparent background anymore. 1534 // Bubble labels don't need a transparent background anymore.
1531 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1535 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1532 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1536 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1533 } 1537 }
1534 #endif // USE_AURA 1538 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698