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

Side by Side Diff: chrome/browser/ui/views/compact_nav/compact_location_bar_view.cc

Issue 7517020: First pass at removal of unneeded dependencies on skia\ext\platform_canvas.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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 | « no previous file | content/plugin/webplugin_proxy.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/compact_nav/compact_location_bar_view.h" 5 #include "chrome/browser/ui/views/compact_nav/compact_location_bar_view.h"
6 6
7 #if defined(TOOLKIT_USES_GTK) 7 #if defined(TOOLKIT_USES_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 11 matching lines...) Expand all
22 #include "chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.h" 22 #include "chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.h"
23 #include "chrome/browser/ui/views/event_utils.h" 23 #include "chrome/browser/ui/views/event_utils.h"
24 #include "chrome/browser/ui/views/frame/browser_view.h" 24 #include "chrome/browser/ui/views/frame/browser_view.h"
25 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 25 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
26 #include "chrome/browser/ui/views/reload_button.h" 26 #include "chrome/browser/ui/views/reload_button.h"
27 #include "content/browser/user_metrics.h" 27 #include "content/browser/user_metrics.h"
28 #include "grit/chromium_strings.h" 28 #include "grit/chromium_strings.h"
29 #include "grit/generated_resources.h" 29 #include "grit/generated_resources.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "grit/theme_resources_standard.h" 31 #include "grit/theme_resources_standard.h"
32 #include "third_party/skia/include/core/SkPaint.h"
32 #include "ui/base/accessibility/accessible_view_state.h" 33 #include "ui/base/accessibility/accessible_view_state.h"
33 #include "ui/base/l10n/l10n_util.h" 34 #include "ui/base/l10n/l10n_util.h"
34 #include "ui/base/resource/resource_bundle.h" 35 #include "ui/base/resource/resource_bundle.h"
35 #include "ui/base/theme_provider.h" 36 #include "ui/base/theme_provider.h"
36 #include "ui/gfx/canvas.h" 37 #include "ui/gfx/canvas.h"
37 #include "ui/gfx/point.h" 38 #include "ui/gfx/point.h"
38 #include "views/background.h" 39 #include "views/background.h"
39 #include "views/controls/button/image_button.h" 40 #include "views/controls/button/image_button.h"
40 #include "views/controls/native/native_view_host.h" 41 #include "views/controls/native/native_view_host.h"
41 #include "views/widget/widget.h" 42 #include "views/widget/widget.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 323
323 InstantController* CompactLocationBarView::GetInstant() { 324 InstantController* CompactLocationBarView::GetInstant() {
324 // TODO(stevet): Re-enable instant for compact nav. 325 // TODO(stevet): Re-enable instant for compact nav.
325 // return browser()->instant(); 326 // return browser()->instant();
326 return NULL; 327 return NULL;
327 } 328 }
328 329
329 TabContentsWrapper* CompactLocationBarView::GetTabContentsWrapper() const { 330 TabContentsWrapper* CompactLocationBarView::GetTabContentsWrapper() const {
330 return browser()->GetSelectedTabContentsWrapper(); 331 return browser()->GetSelectedTabContentsWrapper();
331 } 332 }
OLDNEW
« no previous file with comments | « no previous file | content/plugin/webplugin_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698