mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-11 17:15:57 +01:00
06e73fff15
- Add Views header files in a new include/views directory. - Add initial top-level window (CefWindow), control (CefBrowserView, CefLabelButton, CefMenuButton, CefPanel, CefScrollView, CefTextfield) and layout (CefBoxLayout, CefFlowLayout) support. See libcef/browser/views/view_impl.h comments for implementation details. - Add Views example usage in cefclient and cefsimple and Views unit tests in cef_unittests. Pass the `--use-views` command-line flag to cefclient, cefsimple and cef_unittests to run using the Views framework instead of platform APIs. For cefclient and cefsimple this will create the browser window and all related functionality using the Views framework. For cef_unittests this will run all tests (except OSR tests) in a Views-based browser window. Views- specific unit tests (`--gtest_filter=Views*`) will be run even if the the `--use-views` flag is not specified. - Pass the `--hide-frame` command-line flag to cefclient to demo a frameless Views-based browser window. - Pass the `--hide-controls` command-line flag to cefclient to demo a browser window without top controls. This also works in non-Views mode. - Pass the `--enable-high-dpi-support` command-line flag to cef_unittests on Windows to test high-DPI support on a display that supports it. - Add CefImage for reading/writing image file formats. - Add CefBrowser::DownloadImage() for downloading image URLs as a CefImage representation. This is primarily for loading favicons. - Add CefMenuModel::CreateMenuModel() and CefMenuModelDelegate for creating custom menus. This is primarily for use with CefMenuButton. - Add CefBrowser::TryCloseBrowser() helper for closing a browser. Also improve related documentation in cef_life_span_handler.h. - Rename cef_page_range_t to cef_range_t. It is now also used by CefTextfield. - Remove CefLifeSpanHandler::RunModal() which is never called. - Add draggable regions example to cefclient.
111 lines
3.3 KiB
C++
111 lines
3.3 KiB
C++
// Copyright (c) 2013 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
|
|
#include "cefsimple/simple_app.h"
|
|
|
|
#include <string>
|
|
|
|
#include "cefsimple/simple_handler.h"
|
|
#include "include/cef_browser.h"
|
|
#include "include/cef_command_line.h"
|
|
#include "include/views/cef_browser_view.h"
|
|
#include "include/views/cef_window.h"
|
|
#include "include/wrapper/cef_helpers.h"
|
|
|
|
namespace {
|
|
|
|
// When using the Views framework this object provides the delegate
|
|
// implementation for the CefWindow that hosts the Views-based browser.
|
|
class SimpleWindowDelegate : public CefWindowDelegate {
|
|
public:
|
|
explicit SimpleWindowDelegate(CefRefPtr<CefBrowserView> browser_view)
|
|
: browser_view_(browser_view) {
|
|
}
|
|
|
|
void OnWindowCreated(CefRefPtr<CefWindow> window) OVERRIDE {
|
|
// Add the browser view and show the window.
|
|
window->AddChildView(browser_view_);
|
|
window->Show();
|
|
|
|
// Give keyboard focus to the browser view.
|
|
browser_view_->RequestFocus();
|
|
}
|
|
|
|
void OnWindowDestroyed(CefRefPtr<CefWindow> window) OVERRIDE {
|
|
browser_view_ = NULL;
|
|
}
|
|
|
|
bool CanClose(CefRefPtr<CefWindow> window) OVERRIDE {
|
|
// Allow the window to close if the browser says it's OK.
|
|
CefRefPtr<CefBrowser> browser = browser_view_->GetBrowser();
|
|
if (browser)
|
|
return browser->GetHost()->TryCloseBrowser();
|
|
return true;
|
|
}
|
|
|
|
private:
|
|
CefRefPtr<CefBrowserView> browser_view_;
|
|
|
|
IMPLEMENT_REFCOUNTING(SimpleWindowDelegate);
|
|
DISALLOW_COPY_AND_ASSIGN(SimpleWindowDelegate);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
SimpleApp::SimpleApp() {
|
|
}
|
|
|
|
void SimpleApp::OnContextInitialized() {
|
|
CEF_REQUIRE_UI_THREAD();
|
|
|
|
CefRefPtr<CefCommandLine> command_line =
|
|
CefCommandLine::GetGlobalCommandLine();
|
|
|
|
#if defined(OS_WIN) || defined(OS_LINUX)
|
|
// Create the browser using the Views framework if "--use-views" is specified
|
|
// via the command-line. Otherwise, create the browser using the native
|
|
// platform framework. The Views framework is currently only supported on
|
|
// Windows and Linux.
|
|
const bool use_views = command_line->HasSwitch("use-views");
|
|
#else
|
|
const bool use_views = false;
|
|
#endif
|
|
|
|
// SimpleHandler implements browser-level callbacks.
|
|
CefRefPtr<SimpleHandler> handler(new SimpleHandler(use_views));
|
|
|
|
// Specify CEF browser settings here.
|
|
CefBrowserSettings browser_settings;
|
|
|
|
std::string url;
|
|
|
|
// Check if a "--url=" value was provided via the command-line. If so, use
|
|
// that instead of the default URL.
|
|
url = command_line->GetSwitchValue("url");
|
|
if (url.empty())
|
|
url = "http://www.google.com";
|
|
|
|
if (use_views) {
|
|
// Create the BrowserView.
|
|
CefRefPtr<CefBrowserView> browser_view = CefBrowserView::CreateBrowserView(
|
|
handler, url, browser_settings, NULL, NULL);
|
|
|
|
// Create the Window. It will show itself after creation.
|
|
CefWindow::CreateTopLevelWindow(new SimpleWindowDelegate(browser_view));
|
|
} else {
|
|
// Information used when creating the native window.
|
|
CefWindowInfo window_info;
|
|
|
|
#if defined(OS_WIN)
|
|
// On Windows we need to specify certain flags that will be passed to
|
|
// CreateWindowEx().
|
|
window_info.SetAsPopup(NULL, "cefsimple");
|
|
#endif
|
|
|
|
// Create the first browser window.
|
|
CefBrowserHost::CreateBrowser(window_info, handler, url, browser_settings,
|
|
NULL);
|
|
}
|
|
}
|