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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10698111: browser: Move more files into chrome namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/views/frame/browser_view.h" 5 #include "chrome/browser/ui/views/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2291 matching lines...) Expand 10 before | Expand all | Expand 10 after
2302 focus_manager->RegisterAccelerator( 2302 focus_manager->RegisterAccelerator(
2303 accelerator, ui::AcceleratorManager::kNormalPriority, this); 2303 accelerator, ui::AcceleratorManager::kNormalPriority, this);
2304 } 2304 }
2305 2305
2306 // We don't need the Windows accelerator table anymore. 2306 // We don't need the Windows accelerator table anymore.
2307 free(accelerators); 2307 free(accelerators);
2308 #else 2308 #else
2309 views::FocusManager* focus_manager = GetFocusManager(); 2309 views::FocusManager* focus_manager = GetFocusManager();
2310 DCHECK(focus_manager); 2310 DCHECK(focus_manager);
2311 // Let's fill our own accelerator table. 2311 // Let's fill our own accelerator table.
2312 for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) { 2312 for (size_t i = 0; i < chrome::kAcceleratorMapLength; ++i) {
2313 ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode, 2313 ui::Accelerator accelerator(chrome::kAcceleratorMap[i].keycode,
2314 browser::kAcceleratorMap[i].modifiers); 2314 chrome::kAcceleratorMap[i].modifiers);
2315 accelerator_table_[accelerator] = browser::kAcceleratorMap[i].command_id; 2315 accelerator_table_[accelerator] = chrome::kAcceleratorMap[i].command_id;
2316 2316
2317 // Also register with the focus manager. 2317 // Also register with the focus manager.
2318 focus_manager->RegisterAccelerator( 2318 focus_manager->RegisterAccelerator(
2319 accelerator, ui::AcceleratorManager::kNormalPriority, this); 2319 accelerator, ui::AcceleratorManager::kNormalPriority, this);
2320 } 2320 }
2321 #endif 2321 #endif
2322 } 2322 }
2323 2323
2324 int BrowserView::GetCommandIDForAppCommandID(int app_command_id) const { 2324 int BrowserView::GetCommandIDForAppCommandID(int app_command_id) const {
2325 #if defined(OS_WIN) && !defined(USE_AURA) 2325 #if defined(OS_WIN) && !defined(USE_AURA)
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
2565 bubble->Show(); 2565 bubble->Show();
2566 } 2566 }
2567 2567
2568 void BrowserView::RestackLocationBarContainer() { 2568 void BrowserView::RestackLocationBarContainer() {
2569 #if defined(USE_AURA) 2569 #if defined(USE_AURA)
2570 if (search_view_controller_.get()) 2570 if (search_view_controller_.get())
2571 search_view_controller_->StackAtTop(); 2571 search_view_controller_->StackAtTop();
2572 #endif 2572 #endif
2573 toolbar_->location_bar_container()->StackAtTop(); 2573 toolbar_->location_bar_container()->StackAtTop();
2574 } 2574 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698