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

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

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed bug + latest master 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
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"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/app/chrome_command_ids.h" 12 #include "chrome/app/chrome_command_ids.h"
13 #include "chrome/browser/alternate_nav_url_fetcher.h" 13 #include "chrome/browser/alternate_nav_url_fetcher.h"
14 #include "chrome/browser/chrome_to_mobile_service.h" 14 #include "chrome/browser/chrome_to_mobile_service.h"
15 #include "chrome/browser/chrome_to_mobile_service_factory.h" 15 #include "chrome/browser/chrome_to_mobile_service_factory.h"
16 #include "chrome/browser/command_updater.h" 16 #include "chrome/browser/command_updater.h"
17 #include "chrome/browser/defaults.h" 17 #include "chrome/browser/defaults.h"
18 #include "chrome/browser/extensions/extension_browser_event_router.h"
19 #include "chrome/browser/extensions/extension_service.h" 18 #include "chrome/browser/extensions/extension_service.h"
20 #include "chrome/browser/extensions/extension_system.h" 19 #include "chrome/browser/extensions/extension_system.h"
21 #include "chrome/browser/extensions/location_bar_controller.h" 20 #include "chrome/browser/extensions/location_bar_controller.h"
22 #include "chrome/browser/extensions/tab_helper.h" 21 #include "chrome/browser/extensions/tab_helper.h"
23 #include "chrome/browser/favicon/favicon_tab_helper.h" 22 #include "chrome/browser/favicon/favicon_tab_helper.h"
24 #include "chrome/browser/instant/instant_controller.h" 23 #include "chrome/browser/instant/instant_controller.h"
25 #include "chrome/browser/profiles/profile.h" 24 #include "chrome/browser/profiles/profile.h"
26 #include "chrome/browser/search_engines/template_url.h" 25 #include "chrome/browser/search_engines/template_url.h"
27 #include "chrome/browser/search_engines/template_url_service.h" 26 #include "chrome/browser/search_engines/template_url_service.h"
28 #include "chrome/browser/search_engines/template_url_service_factory.h" 27 #include "chrome/browser/search_engines/template_url_service_factory.h"
(...skipping 1466 matching lines...) Expand 10 before | Expand all | Expand 10 after
1495 } 1494 }
1496 1495
1497 void LocationBarView::CleanupFadeAnimation() { 1496 void LocationBarView::CleanupFadeAnimation() {
1498 // Since we're no longer animating we don't need our layer. 1497 // Since we're no longer animating we don't need our layer.
1499 SetPaintToLayer(false); 1498 SetPaintToLayer(false);
1500 // Bubble labels don't need a transparent background anymore. 1499 // Bubble labels don't need a transparent background anymore.
1501 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1500 ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1502 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE); 1501 selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
1503 } 1502 }
1504 #endif // USE_AURA 1503 #endif // USE_AURA
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698