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

Side by Side Diff: chrome/browser/chromeos/browser_extenders.cc

Issue 341044: Move chromeos code to namespace chromeos. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 1 month 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
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/chromeos_browser_extenders.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <algorithm> 5 #include <algorithm>
6 6
7 #include "app/theme_provider.h" 7 #include "app/theme_provider.h"
8 #include "chrome/app/chrome_dll_resource.h" 8 #include "chrome/app/chrome_dll_resource.h"
9 #include "chrome/browser/chromeos/compact_location_bar.h" 9 #include "chrome/browser/chromeos/compact_location_bar.h"
10 #include "chrome/browser/chromeos/compact_navigation_bar.h" 10 #include "chrome/browser/chromeos/compact_navigation_bar.h"
11 #include "chrome/browser/chromeos/main_menu.h" 11 #include "chrome/browser/chromeos/main_menu.h"
12 #include "chrome/browser/chromeos/status_area_view.h" 12 #include "chrome/browser/chromeos/status_area_view.h"
13 #include "chrome/browser/chromeos/panel_controller.h" 13 #include "chrome/browser/chromeos/panel_controller.h"
14 #include "chrome/browser/views/frame/browser_extender.h" 14 #include "chrome/browser/views/frame/browser_extender.h"
15 #include "chrome/browser/views/frame/browser_frame_gtk.h" 15 #include "chrome/browser/views/frame/browser_frame_gtk.h"
16 #include "chrome/browser/views/frame/browser_view.h" 16 #include "chrome/browser/views/frame/browser_view.h"
17 #include "chrome/browser/views/tabs/tab_overview_types.h" 17 #include "chrome/browser/views/tabs/tab_overview_types.h"
18 #include "chrome/browser/views/tabs/tab_strip.h" 18 #include "chrome/browser/views/tabs/tab_strip.h"
19 #include "chrome/browser/views/tabs/tab_strip_wrapper.h" 19 #include "chrome/browser/views/tabs/tab_strip_wrapper.h"
20 #include "chrome/browser/views/toolbar_view.h" 20 #include "chrome/browser/views/toolbar_view.h"
21 #include "grit/generated_resources.h" 21 #include "grit/generated_resources.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 #include "views/controls/button/button.h" 23 #include "views/controls/button/button.h"
24 #include "views/controls/button/image_button.h" 24 #include "views/controls/button/image_button.h"
25 #include "views/controls/menu/simple_menu_model.h" 25 #include "views/controls/menu/simple_menu_model.h"
26 #include "views/window/window.h" 26 #include "views/window/window.h"
27 27
28 namespace { 28 namespace chromeos {
sky 2009/10/30 00:19:16 This should remain in an anonymous name space.
29 29
30 // NormalExtender adds ChromeOS specific controls and menus to a BrowserView 30 // NormalExtender adds ChromeOS specific controls and menus to a BrowserView
31 // created with Browser::TYPE_NORMAL. This extender adds controls to 31 // created with Browser::TYPE_NORMAL. This extender adds controls to
32 // the title bar as follows: 32 // the title bar as follows:
33 // ____ __ __ 33 // ____ __ __
34 // [MainMenu] / \ \ \ [StatusArea] 34 // [MainMenu] / \ \ \ [StatusArea]
35 // 35 //
36 // and adds the system context menu to the remaining arae of the titlebar. 36 // and adds the system context menu to the remaining arae of the titlebar.
37 // 37 //
38 // For Browser::TYPE_POPUP type of BrowserView, see PopupExtender class below. 38 // For Browser::TYPE_POPUP type of BrowserView, see PopupExtender class below.
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 virtual void OnMouseMovedOnTab(Tab* tab) {} 314 virtual void OnMouseMovedOnTab(Tab* tab) {}
315 315
316 virtual void OnMouseExitedFromTab(Tab* tab) {} 316 virtual void OnMouseExitedFromTab(Tab* tab) {}
317 317
318 // Controls interactions with the window manager for popup panels. 318 // Controls interactions with the window manager for popup panels.
319 scoped_ptr<PanelController> panel_controller_; 319 scoped_ptr<PanelController> panel_controller_;
320 320
321 DISALLOW_COPY_AND_ASSIGN(PopupExtender); 321 DISALLOW_COPY_AND_ASSIGN(PopupExtender);
322 }; 322 };
323 323
324 } // namespace 324 } // namespace chromeos
325 325
326 //////////////////////////////////////////////////////////////////////////////// 326 ////////////////////////////////////////////////////////////////////////////////
327 // BrowserExtender, public: 327 // BrowserExtender, public:
328 328
329 // static 329 // static
330 BrowserExtender* BrowserExtender::Create(BrowserView* browser_view) { 330 BrowserExtender* BrowserExtender::Create(BrowserView* browser_view) {
331 BrowserExtender* extender; 331 BrowserExtender* extender;
332 if (browser_view->browser()->type() & Browser::TYPE_POPUP) 332 if (browser_view->browser()->type() & Browser::TYPE_POPUP)
333 extender = new PopupExtender(browser_view); 333 extender = new chromeos::PopupExtender(browser_view);
334 else 334 else
335 extender = new NormalExtender(browser_view); 335 extender = new chromeos::NormalExtender(browser_view);
336 extender->Init(); 336 extender->Init();
337 return extender; 337 return extender;
338 } 338 }
OLDNEW
« no previous file with comments | « chrome/browser/browser_main.cc ('k') | chrome/browser/chromeos/chromeos_browser_extenders.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698