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

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

Issue 132003: Disable extensions besides externally installed ones and themes. (Closed)
Patch Set: Fix ui test bustage Created 11 years, 6 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 | « chrome/browser/renderer_host/browser_render_process_host.cc ('k') | no next file » | 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/views/frame/browser_view.h" 5 #include "chrome/browser/views/frame/browser_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1394 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 1405
1406 infobar_container_ = new InfoBarContainer(this); 1406 infobar_container_ = new InfoBarContainer(this);
1407 AddChildView(infobar_container_); 1407 AddChildView(infobar_container_);
1408 1408
1409 contents_container_ = new TabContentsContainer; 1409 contents_container_ = new TabContentsContainer;
1410 set_contents_view(contents_container_); 1410 set_contents_view(contents_container_);
1411 AddChildView(contents_container_); 1411 AddChildView(contents_container_);
1412 1412
1413 status_bubble_.reset(new StatusBubbleViews(GetWidget())); 1413 status_bubble_.reset(new StatusBubbleViews(GetWidget()));
1414 1414
1415 if (CommandLine::ForCurrentProcess()->HasSwitch( 1415 extension_shelf_ = new ExtensionShelf(browser_.get());
1416 switches::kEnableExtensions)) { 1416 AddChildView(extension_shelf_);
1417 extension_shelf_ = new ExtensionShelf(browser_.get());
1418 AddChildView(extension_shelf_);
1419 }
1420 1417
1421 #if defined(OS_WIN) 1418 #if defined(OS_WIN)
1422 InitSystemMenu(); 1419 InitSystemMenu();
1423 #endif 1420 #endif
1424 } 1421 }
1425 1422
1426 #if defined(OS_WIN) 1423 #if defined(OS_WIN)
1427 void BrowserView::InitSystemMenu() { 1424 void BrowserView::InitSystemMenu() {
1428 system_menu_contents_.reset(new views::SystemMenuModel(this)); 1425 system_menu_contents_.reset(new views::SystemMenuModel(this));
1429 // We add the menu items in reverse order so that insertion_index never needs 1426 // We add the menu items in reverse order so that insertion_index never needs
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 1811
1815 // static 1812 // static
1816 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 1813 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
1817 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 1814 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
1818 } 1815 }
1819 1816
1820 // static 1817 // static
1821 void BrowserList::AllBrowsersClosed() { 1818 void BrowserList::AllBrowsersClosed() {
1822 views::Window::CloseAllSecondaryWindows(); 1819 views::Window::CloseAllSecondaryWindows();
1823 } 1820 }
OLDNEW
« no previous file with comments | « chrome/browser/renderer_host/browser_render_process_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698