summaryrefslogtreecommitdiffstats
path: root/chrome/browser/frame_util.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 23:51:38 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-16 23:51:38 +0000
commitc2dacc9ec41232903ba700c6aef5ef98bfcb8af8 (patch)
tree4aa4d7100862c64bdd92d70e6323001beb19edb7 /chrome/browser/frame_util.cc
parentd66e710ec668e34271def44d7f0416260657171c (diff)
downloadchromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.zip
chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.gz
chromium_src-c2dacc9ec41232903ba700c6aef5ef98bfcb8af8.tar.bz2
Rename ChromeViews namespace to views
http://crbug.com/2188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/frame_util.cc')
-rw-r--r--chrome/browser/frame_util.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/frame_util.cc b/chrome/browser/frame_util.cc
index 63f27f0..9580c4e 100644
--- a/chrome/browser/frame_util.cc
+++ b/chrome/browser/frame_util.cc
@@ -87,9 +87,10 @@ BrowserWindow* FrameUtil::CreateBrowserWindow(const gfx::Rect& bounds,
}
// static
-bool FrameUtil::LoadAccelerators(BrowserWindow* frame,
+bool FrameUtil::LoadAccelerators(
+ BrowserWindow* frame,
HACCEL accelerator_table,
- ChromeViews::AcceleratorTarget* accelerator_target) {
+ views::AcceleratorTarget* accelerator_target) {
DCHECK(!g_browser_process->IsUsingNewFrames());
// We have to copy the table to access its contents.
@@ -103,18 +104,18 @@ bool FrameUtil::LoadAccelerators(BrowserWindow* frame,
CopyAcceleratorTable(accelerator_table, accelerators, count);
HWND hwnd = static_cast<HWND>(frame->GetPlatformID());
- ChromeViews::FocusManager* focus_manager =
- ChromeViews::FocusManager::GetFocusManager(hwnd);
+ views::FocusManager* focus_manager =
+ views::FocusManager::GetFocusManager(hwnd);
DCHECK(focus_manager);
// Let's build our own accelerator table.
- std::map<ChromeViews::Accelerator, int>* our_accelerators =
- new std::map<ChromeViews::Accelerator, int>;
+ std::map<views::Accelerator, int>* our_accelerators =
+ new std::map<views::Accelerator, int>;
for (int i = 0; i < count; ++i) {
bool alt_down = (accelerators[i].fVirt & FALT) == FALT;
bool ctrl_down = (accelerators[i].fVirt & FCONTROL) == FCONTROL;
bool shift_down = (accelerators[i].fVirt & FSHIFT) == FSHIFT;
- ChromeViews::Accelerator accelerator(accelerators[i].key,
+ views::Accelerator accelerator(accelerators[i].key,
shift_down, ctrl_down, alt_down);
(*our_accelerators)[accelerator] = accelerators[i].cmd;