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

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

Issue 3133001: Issue 4448: Hide the address bar for popups in ChromeOS (Closed)
Patch Set: Merge fix. Created 10 years, 4 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/chromeos/frame/browser_view.h" 5 #include "chrome/browser/chromeos/frame/browser_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 else 438 else
439 otr_avatar_icon_->set_background(NULL); 439 otr_avatar_icon_->set_background(NULL);
440 } 440 }
441 441
442 } // namespace chromeos 442 } // namespace chromeos
443 443
444 // static 444 // static
445 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) { 445 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
446 // Create a browser view for chromeos. 446 // Create a browser view for chromeos.
447 BrowserView* view; 447 BrowserView* view;
448 if (browser->type() & (Browser::TYPE_POPUP | Browser::TYPE_APP_PANEL)) 448 if ((browser->type() == Browser::TYPE_POPUP) ||
449 (browser->type() == Browser::TYPE_APP_POPUP) ||
450 (browser->type() == Browser::TYPE_APP_PANEL))
449 view = new chromeos::PanelBrowserView(browser); 451 view = new chromeos::PanelBrowserView(browser);
450 else 452 else
451 view = new chromeos::BrowserView(browser); 453 view = new chromeos::BrowserView(browser);
452 BrowserFrame::Create(view, browser->profile()); 454 BrowserFrame::Create(view, browser->profile());
453 return view; 455 return view;
454 } 456 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/frame/browser_frame_chromeos.cc ('k') | chrome/browser/views/frame/browser_frame_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698