chrome/browser/ui/webui/web_ui_util.cc - Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/web_ui_util.cc

Issue 11896047: Move the methods in disposition_utils.h and event_disposition.h to ui\base\window_open_disposition.… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix regex in ui.gyp 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/web_ui_util.cc

===================================================================

--- chrome/browser/ui/webui/web_ui_util.cc (revision 178083)

+++ chrome/browser/ui/webui/web_ui_util.cc (working copy)

@@ -11,10 +11,10 @@

#include "base/i18n/rtl.h"

#include "base/logging.h"

#include "base/memory/ref_counted_memory.h"

-#include "chrome/browser/disposition_utils.h"

#include "googleurl/src/gurl.h"

#include "net/base/escape.h"

#include "grit/platform_locale_settings.h"

+#include "ui/base/window_open_disposition.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/gfx/codec/png_codec.h"

#include "ui/gfx/image/image_skia.h"

@@ -88,9 +88,8 @@

CHECK(args->GetBoolean(start_index++, &ctrl_key));

CHECK(args->GetBoolean(start_index++, &meta_key));

CHECK(args->GetBoolean(start_index++, &shift_key));

- return disposition_utils::DispositionFromClick(button == 1.0, alt_key,

- ctrl_key, meta_key, shift_key);

+ return ui::DispositionFromClick(

+ button == 1.0, alt_key, ctrl_key, meta_key, shift_key);

}

bool ParseScaleFactor(const base::StringPiece& identifier,

« no previous file with comments | « chrome/browser/ui/webui/generic_handler.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »