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

Side by Side Diff: chrome/browser/ui/gtk/location_bar_view_gtk.cc

Issue 12036003: Move window_open_disposition.h from webkit/ into ui/base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 7 years, 11 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/location_bar_view_gtk.h ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/gtk/location_bar_view_gtk.h" 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 #include "content/public/browser/web_contents.h" 82 #include "content/public/browser/web_contents.h"
83 #include "grit/generated_resources.h" 83 #include "grit/generated_resources.h"
84 #include "grit/theme_resources.h" 84 #include "grit/theme_resources.h"
85 #include "net/base/net_util.h" 85 #include "net/base/net_util.h"
86 #include "ui/base/accelerators/platform_accelerator_gtk.h" 86 #include "ui/base/accelerators/platform_accelerator_gtk.h"
87 #include "ui/base/dragdrop/gtk_dnd_util.h" 87 #include "ui/base/dragdrop/gtk_dnd_util.h"
88 #include "ui/base/gtk/gtk_hig_constants.h" 88 #include "ui/base/gtk/gtk_hig_constants.h"
89 #include "ui/base/gtk/gtk_signal_registrar.h" 89 #include "ui/base/gtk/gtk_signal_registrar.h"
90 #include "ui/base/l10n/l10n_util.h" 90 #include "ui/base/l10n/l10n_util.h"
91 #include "ui/base/resource/resource_bundle.h" 91 #include "ui/base/resource/resource_bundle.h"
92 #include "ui/base/window_open_disposition.h"
92 #include "ui/gfx/canvas_skia_paint.h" 93 #include "ui/gfx/canvas_skia_paint.h"
93 #include "ui/gfx/font.h" 94 #include "ui/gfx/font.h"
94 #include "ui/gfx/gtk_util.h" 95 #include "ui/gfx/gtk_util.h"
95 #include "ui/gfx/image/image.h" 96 #include "ui/gfx/image/image.h"
96 #include "webkit/glue/window_open_disposition.h"
97 97
98 using content::NavigationEntry; 98 using content::NavigationEntry;
99 using content::OpenURLParams; 99 using content::OpenURLParams;
100 using content::WebContents; 100 using content::WebContents;
101 using extensions::LocationBarController; 101 using extensions::LocationBarController;
102 using extensions::Extension; 102 using extensions::Extension;
103 103
104 namespace { 104 namespace {
105 105
106 // We are positioned with a little bit of extra space that we don't use now. 106 // We are positioned with a little bit of extra space that we don't use now.
(...skipping 2075 matching lines...) Expand 10 before | Expand all | Expand 10 after
2182 } 2182 }
2183 2183
2184 void LocationBarViewGtk::PageActionViewGtk::InspectPopup( 2184 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
2185 ExtensionAction* action) { 2185 ExtensionAction* action) {
2186 ExtensionPopupGtk::Show( 2186 ExtensionPopupGtk::Show(
2187 action->GetPopupUrl(current_tab_id_), 2187 action->GetPopupUrl(current_tab_id_),
2188 owner_->browser_, 2188 owner_->browser_,
2189 event_box_.get(), 2189 event_box_.get(),
2190 ExtensionPopupGtk::SHOW_AND_INSPECT); 2190 ExtensionPopupGtk::SHOW_AND_INSPECT);
2191 } 2191 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk.h ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698