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

Side by Side Diff: content/browser/webui/generic_handler.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « content/browser/web_contents/web_drag_dest_mac.mm ('k') | content/browser/webui/web_ui_impl.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 "content/browser/webui/generic_handler.h" 5 #include "content/browser/webui/generic_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 CHECK(args->GetBoolean(6, &shift_key)); 43 CHECK(args->GetBoolean(6, &shift_key));
44 44
45 CHECK(button == 0.0 || button == 1.0); 45 CHECK(button == 0.0 || button == 1.0);
46 bool middle_button = (button == 1.0); 46 bool middle_button = (button == 1.0);
47 47
48 WindowOpenDisposition disposition = ui::DispositionFromClick( 48 WindowOpenDisposition disposition = ui::DispositionFromClick(
49 middle_button, alt_key, ctrl_key, meta_key, shift_key); 49 middle_button, alt_key, ctrl_key, meta_key, shift_key);
50 if (disposition == CURRENT_TAB && target_string == "_blank") 50 if (disposition == CURRENT_TAB && target_string == "_blank")
51 disposition = NEW_FOREGROUND_TAB; 51 disposition = NEW_FOREGROUND_TAB;
52 52
53 web_ui()->GetWebContents()->OpenURL(OpenURLParams( 53 web_ui()->GetWebContents()->OpenURL(OpenURLParams(GURL(url_string),
54 GURL(url_string), Referrer(), disposition, PAGE_TRANSITION_LINK, false)); 54 Referrer(),
55 disposition,
56 ui::PAGE_TRANSITION_LINK,
57 false));
55 58
56 // This may delete us! 59 // This may delete us!
57 } 60 }
58 61
59 } // namespace content 62 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_drag_dest_mac.mm ('k') | content/browser/webui/web_ui_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698